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