diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2017-06-14 19:53:34 -0400 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2017-06-14 19:55:14 -0400 |
| commit | e0c122119afea4c951c0c57144d26a473118c254 (patch) | |
| tree | 34a02a56f9b017201dfb721ef678c711351466d6 /VERSION.txt | |
| parent | e0eb815b67734abd09ff41e2271630d4b2a6d760 (diff) | |
Fixup botched merge
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 |