potok/tinyxml2
1
0
Fork 0
Code Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #721 from MortenMacFly/master

Browse Source 
* removed merge artefact from Doxygen control file
This commit is contained in:
Lee Thomason
2018-11-18 17:28:58 -08:00
committed by GitHub
parent de6d164822 d944ef762f
commit 8f4a9a8cc2
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dox
View File

@@ -38,11 +38,7 @@ PROJECT_NAME = "TinyXML-2"
# could be handy for archiving the generated documentation or if some version # could be handy for archiving the generated documentation or if some version
# control system is used. # control system is used.
<<<<<<< HEAD
PROJECT_NUMBER = 7.0.1 PROJECT_NUMBER = 7.0.1
=======
PROJECT_NUMBER = 7.0.1
>>>>>>> master
# Using the PROJECT_BRIEF tag one can provide an optional one line description # 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 # for a project that appears at the top of each page and should give viewer a