Mercurial > hgrepos > hgweb.cgi > skipweb

changeset 165:5ff89f053517

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge error removed
author HIROSE Yuuji <yuuji@koeki-u.ac.jp>
date Fri, 15 Feb 2013 15:40:46 +0900
parents 7f072bbbf81d
children 4ae66a8c1800
files .htaccess
diffstat 1 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.htaccess	Fri Feb 15 15:37:39 2013 +0900
+++ b/.htaccess	Fri Feb 15 15:40:46 2013 +0900
@@ -1,5 +1,3 @@
-<<<<<<< local
 AddHandler server-parsed html
-Options +Inoludes=======
+Options +Inoludes
 AddType "text/html; charset=euc-jp" .html
->>>>>>> other

yatex.org