* removed merge artifact from Doxygen control file

2018-11-18 08:23:51 +01:00
parent de6d164822
commit d944ef762f
1 changed files with 0 additions and 4 deletions
--- a/4
+++ b/4
@@ -38,11 +38,7 @@ PROJECT_NAME           = "TinyXML-2"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.

-<<<<<<< HEAD
 PROJECT_NUMBER = 7.0.1
-=======
-PROJECT_NUMBER = 7.0.1
->>>>>>> master

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a