aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/index.php
diff options
context:
space:
mode:
Diffstat (limited to 'doc/html/index.php')
-rw-r--r--doc/html/index.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/html/index.php b/doc/html/index.php
index 1796685a2..4ef28aada 100644
--- a/doc/html/index.php
+++ b/doc/html/index.php
@@ -1,10 +1,17 @@
<!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