diff options
Diffstat (limited to 'lib/common/BannerText.h')
| -rw-r--r-- | lib/common/BannerText.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/lib/common/BannerText.h b/lib/common/BannerText.h index ae3ff841..f0772c9c 100644 --- a/lib/common/BannerText.h +++ b/lib/common/BannerText.h @@ -10,11 +10,6 @@ #ifndef BANNERTEXT__H #define BANNERTEXT__H -<<<<<<< HEAD -#define BANNER_TEXT(UtilityName) \ - "Box " UtilityName " v" BOX_VERSION ", (c) Ben Summers and " \ - "contributors 2003-2010" -======= #ifdef NEED_BOX_VERSION_H # include "BoxVersion.h" #endif @@ -22,7 +17,6 @@ #define BANNER_TEXT(UtilityName) \ "Box " UtilityName " v" BOX_VERSION ", (c) Ben Summers and " \ "contributors 2003-2011" ->>>>>>> 0.12 #endif // BANNERTEXT__H |