Merge branch 'master' of /users/jy2wong/www/rofl/csc
authorJacob Parker <j3parker@csclub.uwaterloo.ca>
Sat, 25 Feb 2012 01:05:05 +0000 (20:05 -0500)
committerJacob Parker <j3parker@csclub.uwaterloo.ca>
Sat, 25 Feb 2012 01:05:05 +0000 (20:05 -0500)
Conflicts:
.htaccess

1  2 
.htaccess

diff --cc .htaccess
index 7b23492,c14df1a..0000000
deleted file mode 100644,100644
+++ /dev/null
@@@ -1,4 -1,4 +1,0 @@@
--RewriteEngine on
- RewriteBase /~j3parker/
 -RewriteBase /~jy2wong/rofl/csc/
--RewriteRule ^pub/(.*) - [L]
--RewriteRule ^(.*) bin/web [L]