Fixed syntax error in apache plugin.

Author: tbrehm

server/plugins-available/apache2_plugin.inc.php

@@ -1262,13 +1262,10 @@ private function _patchVhostWebdav($fileName, $webdavRoot) {
 						*/
 						$fn = substr($file, 0, strlen($file) - strlen('.htdigest'));
 						$output .= "\n";
-<<<<<<< .working
-						$output .= "      Alias /" . $fn . ' ' . $webdavRoot . '/' . $fn . "\n";
-						$output .= "      <Location /" . $fn . ">\n";
-=======
+						// $output .= "      Alias /" . $fn . ' ' . $webdavRoot . '/' . $fn . "\n";
+						// $output .= "      <Location /" . $fn . ">\n";
 						$output .= "      Alias /webdav/" . $fn . ' ' . $webdavRoot . '/' . $fn . "\n";
 						$output .= "      <Location /webdav/" . $fn . ">\n";
->>>>>>> .merge-right.r2129
 						$output .= "        DAV On\n";
 						$output .= "        AuthType Digest\n";
 						$output .= "        AuthName \"" . $fn . "\"\n";