]> git.parisson.com Git - telemeta-pages.git/commitdiff
ignore home text
authoryomguy <yomguy@parisson.com>
Thu, 27 Oct 2011 12:29:38 +0000 (14:29 +0200)
committeryomguy <yomguy@parisson.com>
Thu, 27 Oct 2011 12:29:38 +0000 (14:29 +0200)
en/.gitattributes [new file with mode: 0644]
fr/.gitattributes [new file with mode: 0644]

diff --git a/en/.gitattributes b/en/.gitattributes
new file mode 100644 (file)
index 0000000..ea96728
--- /dev/null
@@ -0,0 +1,2 @@
+home.rst merge=ours
+legal_notices.rst merge:ours
diff --git a/fr/.gitattributes b/fr/.gitattributes
new file mode 100644 (file)
index 0000000..ea96728
--- /dev/null
@@ -0,0 +1,2 @@
+home.rst merge=ours
+legal_notices.rst merge:ours