From b57e73519975b8d9cc5887c2e35cb36dda6463dc Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 20 Oct 2015 21:34:58 -0700 Subject: old merge conflict --- doc/html/index.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'doc/html') 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 @@ -<<<<<<< HEAD - Hubzilla Doxygen API Documentation - - -

Hubzilla Doxygen API Documentation not rendered

-======= $Projectname Doxygen API Documentation

$Projectname Doxygen API Documentation not rendered

->>>>>>> f866a42a42b9e12756353f5bb39a0f31a64bb26a + To get the Doxygen API Documentation you must render it with the program Doxygen (included in most distributions).

 $ doxygen util/Doxyfile
-- 
cgit v1.2.3