old merge conflict

2015-10-20 21:34:58 -07:00 · 2015-10-20 21:34:58 -07:00 · b57e735199
commit b57e735199
parent 38816d7e41
1 changed files with 1 additions and 7 deletions
--- a/doc/html/index.php
+++ b/doc/html/index.php
@ -1,17 +1,11 @@
 <!DOCTYPE html>
 <html>
 <head>
-<<<<<<< HEAD
-	<title>Hubzilla Doxygen API Documentation</title>
-</head>
-<body>
-<h1>Hubzilla Doxygen API Documentation not rendered</h1>
-=======
 	<title>$Projectname Doxygen API Documentation</title>
 </head>
 <body>
 <h1>$Projectname Doxygen API Documentation not rendered</h1>
->>>>>>> f866a42a42b9e12756353f5bb39a0f31a64bb26a
+
 To get the Doxygen API Documentation you must render it with the program <a href="http://www.doxygen.org">Doxygen</a> (included in most distributions).
 <pre>
 $ doxygen util/Doxyfile