projects
/
unres.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
unified .gitignore
[unres.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index
abb3640
..
8a8f64c
100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-1,4
+1,3
@@
-<<<<<<< HEAD
# ignore compiled stuff
*.[oa]
@@
-7,13
+6,12
@@
*~
-# ifnore build dir
+# ignore build dir
build/
-=======
-~.[ao]
+
+# ignored dirs form adasko
gradcheck/
mapcheck/
run/
sympcheck/
->>>>>>> adasko