diff options
| author | Morten MacFly <mac-fly@gmx.net> | 2018-11-18 10:23:51 +0300 |
|---|---|---|
| committer | Morten MacFly <mac-fly@gmx.net> | 2018-11-18 10:23:51 +0300 |
| commit | d944ef762fd2c6c4e1e3e61cd4e08289a9ec0d46 (patch) | |
| tree | 58c0763b710790280c14cf15252e81d3099d76f2 /dox | |
| parent | de6d164822076f9b1e26a7222808a25ac03867d8 (diff) | |
* removed merge artifact from Doxygen control file
Diffstat (limited to 'dox')
| -rw-r--r-- | dox | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -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
|