aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-10-20 21:34:58 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-10-20 21:34:58 -0700
commitb57e73519975b8d9cc5887c2e35cb36dda6463dc (patch)
tree6f5ad33652439b22c83c38640064d66f4c339129
parent38816d7e41de65de5b8a328a3b8d808c6a438779 (diff)
downloadvolse-hubzilla-b57e73519975b8d9cc5887c2e35cb36dda6463dc.tar.gz
volse-hubzilla-b57e73519975b8d9cc5887c2e35cb36dda6463dc.tar.bz2
volse-hubzilla-b57e73519975b8d9cc5887c2e35cb36dda6463dc.zip
old merge conflict
-rw-r--r--doc/html/index.php8
1 files changed, 1 insertions, 7 deletions
diff --git a/doc/html/index.php b/doc/html/index.php
index 4ef28aada..2e1b4277c 100644
--- 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