projects
/
cdsspec-compiler.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
model: remove unused #include
[cdsspec-compiler.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index f9a26768ae7410a9403f3d87bec5d3829bcb0ab9..d4b7fc44362fc1e7b3fe90cc1d994d68ca7a7a29 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-3,11
+3,8
@@
.*.swp
*.so
*~
-<<<<<<< HEAD
-=======
-*.*~
->>>>>>> subramanian
# files in this directory
/model
/tags
+/docs