From d944ef762fd2c6c4e1e3e61cd4e08289a9ec0d46 Mon Sep 17 00:00:00 2001
From: Morten MacFly <mac-fly@gmx.net>
Date: Sun, 18 Nov 2018 08:23:51 +0100
Subject: [PATCH] * removed merge artifact from Doxygen control file

---
 dox | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dox b/dox
index fd50e79..e04ebac 100644
--- a/dox
+++ b/dox
@@ -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