projects
/
unres.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
install doc
\7f
umentation files
[unres.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index
4c3f4f2
..
521532d
100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-1,9
+1,3
@@
-<<<<<<< HEAD
-*.[oa]
-*~
-*.swp
-*.[eo][0-9][0-9][0-9][0-9]*
-=======
# ignore compiled stuff
*.[oa]
# ignore compiled stuff
*.[oa]
@@
-11,9
+5,12
@@
*.swp
*~
*.swp
*~
+# ignore PBS output and error files
+*.[eo][0-9][0-9][0-9][0-9]*
# ignore build dir
build/
# ignore build dir
build/
+source/ga/build
# ignored dirs form adasko
gradcheck/
# ignored dirs form adasko
gradcheck/
@@
-21,4
+18,3
@@
mapcheck/
run/
sympcheck/
run/
sympcheck/
->>>>>>> aebadf9023e437f497f92dfcf2303c16f60917c1