- added .gitattributes

rpm-software-management · Oct 23, 2013 · 7e8b19d · 7e8b19d
1 parent 41e5eed
commit 7e8b19d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+licomps/version.cmake   merge=ours
diff --git a/libcomps/.gitattributes b/libcomps/.gitattributes
@@ -0,0 +1 @@
+version.cmake merge=ours