annotate .htaccess.orig @ 2089:f7dd0b91eff5

merge
author KAMADA Kei <c110206@f.koeki-u.ac.jp>
date Tue, 17 Sep 2013 18:28:36 +0900
parents 32c23e395524
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1889
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