|
@@ -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
|
Lee Thomason