Merge fixes

This commit is contained in:
DanB
2017-11-20 18:05:50 +01:00
parent 02d13bd296
commit d5b60261c0
4 changed files with 5 additions and 5 deletions

View File

@@ -107,7 +107,6 @@ func (vers Versions) Compare(curent Versions, storType string) string {
return ""
}
<<<<<<< HEAD
func CurrentDataDBVersions() Versions {
return Versions{
utils.StatS: 2,