annotate .htaccess.orig @ 156:adbb6d5ca0d8

Merged
author KAMADA Kei <c110206@f.koeki-u.ac.jp>
date Fri, 15 Feb 2013 14:27:24 +0900
parents a6e44ee50df8
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
156
KAMADA Kei <c110206@f.koeki-u.ac.jp>
parents: 154
diff changeset
1 <<<<<<< local
KAMADA Kei <c110206@f.koeki-u.ac.jp>
parents: 154
diff changeset
2 AddType "text/html; charset=euc-jp" .html=======
KAMADA Kei <c110206@f.koeki-u.ac.jp>
parents: 154
diff changeset
3 AddHandler cgi-script .rb
KAMADA Kei <c110206@f.koeki-u.ac.jp>
parents: 154
diff changeset
4 Options +ExecCGI>>>>>>> other

yatex.org