diff options
Diffstat (limited to 'version.inc')
| -rw-r--r-- | version.inc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/version.inc b/version.inc index 30d5c870f..7e47edd58 100644 --- a/version.inc +++ b/version.inc @@ -1,5 +1 @@ -<<<<<<< HEAD -2015-11-25.1227 -======= 2015-11-27.1229 ->>>>>>> upstream/master |