Mercurial > hgrepos > hgweb.cgi > skipweb

changeset 1898:6476e7622da8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
daigaku.rb changed
author Miyahara Emiri <c110188@f.koeki-u.ac.jp>
date Fri, 15 Feb 2013 15:37:39 +0900
parents bdccc14f2afb
children c96f4b176af7
files .htaccess bus_cgi/daigaku.rb
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.htaccess	Fri Feb 15 15:30:47 2013 +0900
+++ b/.htaccess	Fri Feb 15 15:37:39 2013 +0900
@@ -1,1 +1,5 @@
+<<<<<<< local
+AddHandler server-parsed html
+Options +Inoludes=======
 AddType "text/html; charset=euc-jp" .html
+>>>>>>> other
--- a/bus_cgi/daigaku.rb	Fri Feb 15 15:30:47 2013 +0900
+++ b/bus_cgi/daigaku.rb	Fri Feb 15 15:37:39 2013 +0900
@@ -1,4 +1,4 @@
-#!/usr/koeki/bin/ruby
+#!/usr/bin/env ruby
 #coding: euc-jp
 
 require 'cgi'

yatex.org