BGBM BDI Projects
/
taxeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
[taxeditor.git]
/
eu.etaxonomy.taxeditor.cdmlib
/
.gitignore
diff --git
a/eu.etaxonomy.taxeditor.cdmlib/.gitignore
b/eu.etaxonomy.taxeditor.cdmlib/.gitignore
index c5e82d74585d15d6ea821b5f23cd65624190f244..1fa4977834fa6a265bebdb83c4d9ac0c06a8707c 100644
(file)
--- a/
eu.etaxonomy.taxeditor.cdmlib/.gitignore
+++ b/
eu.etaxonomy.taxeditor.cdmlib/.gitignore
@@
-1
+1,5
@@
-bin
\ No newline at end of file
+<<<<<<< HEAD
+bin
+=======
+bin
+>>>>>>> d24b444b7bf4e1bd048f864bcfede121794caddf