]> 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: 4e9e85e)
ignore home text
authoryomguy <yomguy@parisson.com>
Thu, 27 Oct 2011 12:26:37 +0000 (14:26 +0200)
committeryomguy <yomguy@parisson.com>
Thu, 27 Oct 2011 12:26:37 +0000 (14:26 +0200)
telemeta/pages/en/.gitattributes [new file with mode: 0644] patch | blob
telemeta/pages/fr/.gitattributes [new file with mode: 0644] patch | blob

diff --git a/telemeta/pages/en/.gitattributes b/telemeta/pages/en/.gitattributes
new file mode 100644 (file)
index 0000000..5219863
--- /dev/null
+++ b/telemeta/pages/en/.gitattributes
@@ -0,0 +1,3 @@
+home.rst merge=ours
+legal_notices.rst merge=ours
+
diff --git a/telemeta/pages/fr/.gitattributes b/telemeta/pages/fr/.gitattributes
new file mode 100644 (file)
index 0000000..5219863
--- /dev/null
+++ b/telemeta/pages/fr/.gitattributes
@@ -0,0 +1,3 @@
+home.rst merge=ours
+legal_notices.rst merge=ours
+
Unnamed repository; edit this file 'description' to name the repository.