fix got ignore

author yomguy <yomguy@parisson.com>

Fri, 28 Oct 2011 12:11:31 +0000 (14:11 +0200)

committer yomguy <yomguy@parisson.com>

Fri, 28 Oct 2011 12:11:31 +0000 (14:11 +0200)
author yomguy <yomguy@parisson.com>
Fri, 28 Oct 2011 12:11:31 +0000 (14:11 +0200)
committer yomguy <yomguy@parisson.com>
Fri, 28 Oct 2011 12:11:31 +0000 (14:11 +0200)
diff --cc telemeta/pages/en/.gitattributes

index 87e781d3415bb0e34ee5abca5fbf66db1b06d1bf,a84e433c535225228ff139f94ec04d9dd07fec39..30d85567b5921c3a6c14d0d1eea607bcf3122e58
--- 1/telemeta/pages/en/.gitattributes
--- 2/telemeta/pages/en/.gitattributes
+++ b/telemeta/pages/en/.gitattributes
@@@ -1,1 -1,2 +1,1 @@@
- home.rst legal_notices.rst merge=ours
+ *.rst
- -
diff --cc telemeta/pages/fr/.gitattributes

index 87e781d3415bb0e34ee5abca5fbf66db1b06d1bf,a84e433c535225228ff139f94ec04d9dd07fec39..30d85567b5921c3a6c14d0d1eea607bcf3122e58
--- 1/telemeta/pages/fr/.gitattributes
--- 2/telemeta/pages/fr/.gitattributes
+++ b/telemeta/pages/fr/.gitattributes
@@@ -1,1 -1,2 +1,1 @@@
- home.rst legal_notices.rst merge=ours
+ *.rst
- -
author	yomguy <yomguy@parisson.com>
	Fri, 28 Oct 2011 12:11:31 +0000 (14:11 +0200)
committer	yomguy <yomguy@parisson.com>
	Fri, 28 Oct 2011 12:11:31 +0000 (14:11 +0200)
		1	2
telemeta/pages/en/.gitattributes	patch \|	diff1 \|	diff2 \|	blob \| history
telemeta/pages/fr/.gitattributes	patch \|	diff1 \|	diff2 \|	blob \| history