Mercurial > hgrepos > hgweb.cgi > skipweb

diff .htaccess.orig @ 1889:32c23e395524

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged
author KAMADA Kei <c110206@f.koeki-u.ac.jp>
date Fri, 15 Feb 2013 14:27:24 +0900
parents a6e44ee50df8
children
line wrap: on
line diff
--- a/.htaccess.orig	Thu Feb 14 21:39:18 2013 +0900
+++ b/.htaccess.orig	Fri Feb 15 14:27:24 2013 +0900
@@ -1,1 +1,4 @@
-AddType "text/html; charset=euc-jp" .html
\ No newline at end of file
+<<<<<<< local
+AddType "text/html; charset=euc-jp" .html=======
+AddHandler cgi-script   .rb
+Options    +ExecCGI>>>>>>> other

yatex.org