VERSION in lolita-translation-0.0.4 vs VERSION in lolita-translation-0.1.0

- old
+ new

@@ -1,4 +1,8 @@
-0.0.4
\ No newline at end of file
+<<<<<<< HEAD
+0.1.0
+=======
+0.0.4
+>>>>>>> 38796e7ad979f60efef15f97f75b327353a5833b