diff options
Diffstat (limited to 'VERSION.txt')
| -rw-r--r-- | VERSION.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/VERSION.txt b/VERSION.txt index 2201711b..0188cacd 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,6 +1,2 @@ -<<<<<<< HEAD -USE_SVN_VERSION -======= 0.12 ->>>>>>> 0.12 boxbackup |