fix

2019-05-22 22:48:35 +08:00
parent 2e1f513107
commit f0a256f088
1 changed files with 2 additions and 5 deletions
@@ -22,11 +22,8 @@
    {"file": "20180928-1.sql", "version": 20},
    {"file": "20181001-1.sql", "version": 21},
    {"file": "20181010-1.sql", "version": 22},
-<<<<<<< Updated upstream
-    {"file": "20190305-1.sql", "version": 23}
-=======
-    {"file": "20190522-1.sql", "version": 23}
->>>>>>> Stashed changes
+    {"file": "20190305-1.sql", "version": 23},
+    {"file": "20190522-1.sql", "version": 24}
  ],
  "test": []
 }