]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: da8181d)
fix ignore files
authoryomguy <yomguy@parisson.com>
Fri, 28 Oct 2011 12:35:47 +0000 (14:35 +0200)
committeryomguy <yomguy@parisson.com>
Fri, 28 Oct 2011 12:35:47 +0000 (14:35 +0200)
telemeta/pages/.gitattributes [new file with mode: 0644] patch | blob
telemeta/pages/en/.gitattributes [deleted file] patch | blob | history

diff --git a/telemeta/pages/.gitattributes b/telemeta/pages/.gitattributes
new file mode 100644 (file)
index 0000000..4da71df
--- /dev/null
+++ b/telemeta/pages/.gitattributes
@@ -0,0 +1,2 @@
+*.rst merge=ours
+
diff --git a/telemeta/pages/en/.gitattributes b/telemeta/pages/en/.gitattributes
deleted file mode 100644 (file)
index a84e433..0000000
--- a/telemeta/pages/en/.gitattributes
+++ /dev/null
@@ -1,2 +0,0 @@
-*.rst
-
Unnamed repository; edit this file 'description' to name the repository.