vahagn/gragir
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of http://192.168.0.4:8080/vahagn/gragir

Browse Source
This commit is contained in:
Vahagn Khachatryan
2018-09-11 07:24:19 +01:00
parent 9155203689 e75fd39a62
commit 4ed17e5596
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@@ -104,5 +104,10 @@ ENV/
samples/*.zip samples/*.zip
temp/* temp/*
test_out/* test_out/*
<<<<<<< HEAD
.vscode/gragir.code-workspace .vscode/gragir.code-workspace
gragir.7z gragir.7z
||||||| merged common ancestors
=======
.vscode/gragir..code-workspace
>>>>>>> e75fd39a62122b51fe018cdc4bab7100a4d1208f