r22692 - htdocs/branches/beta - Fix .htaccess on beta website

[Geert Janssens]

Author: gjanssens
Date: 2013-01-11 11:40:24 -0500 (Fri, 11 Jan 2013)
New Revision: 22692
Trac: http://svn.gnucash.org/trac/changeset/22692

Modified:
   htdocs/branches/beta/.htaccess
Log:
Fix .htaccess on beta website

Modified: htdocs/branches/beta/.htaccess
===================================================================
--- htdocs/branches/beta/.htaccess	2013-01-11 03:58:01 UTC (rev 22691)
+++ htdocs/branches/beta/.htaccess	2013-01-11 16:40:24 UTC (rev 22692)
@@ -11,11 +11,7 @@
 # The old website was kept here for historical purposes.
 # Any attempt to access it will be redirected to the
 # new site's main page.
-<<<<<<< HEAD
-RedirectMatch permanent /old-website/* http://www.gnucash.org
-=======
 RedirectMatch permanent /old-website/.* http://www.gnucash.org
->>>>>>> trunk
 
 # Images were once stored in /externals, while they are now in /images
 # Redirect some that get a lot of "not found hits"