Add *.desktop.cmake files to .gitattributes, too

KDE · Oct 28, 2013 · 65323c2 · 65323c2
1 parent 1dd33cd
commit 65323c2
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1,2 @@
 *.desktop merge=ours
+*.desktop.cmake merge=ours