projects
/
xemelios
/
xemelios-etat-frais-spl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
project home
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git+ssh://scm.adullact.net/var/lib/gforge/chroot/scmrepos...
[xemelios/xemelios-etat-frais-spl.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index
9ef9604
..
1ed8682
100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-1,2
+1,5
@@
build
+<<<<<<< HEAD
+=======
+>>>>>>> 700375a55916422cbccbde1e7db7704fc55a0697