harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

old merge conflict

Browse Source
This commit is contained in:
redmatrix 2015-10-20 21:34:58 -07:00
parent 38816d7e41
commit b57e735199
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/html/index.php
View File

@ -1,17 +1,11 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<<<<<<< HEAD
<title>Hubzilla Doxygen API Documentation</title>
</head>
<body>
<h1>Hubzilla Doxygen API Documentation not rendered</h1>
=======
<title>$Projectname Doxygen API Documentation</title> <title>$Projectname Doxygen API Documentation</title>
</head> </head>
<body> <body>
<h1>$Projectname Doxygen API Documentation not rendered</h1> <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). 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> <pre>
$ doxygen util/Doxyfile $ doxygen util/Doxyfile