.

june07 · May 29, 2024 · bbe9a3d · bbe9a3d
1 parent b687648
commit bbe9a3d
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/manifest.json b/manifest.json
@@ -76,9 +76,5 @@
     ]
   },
   "short_name": "__MSG_appShortName__",
-<<<<<<< HEAD
-  "version_name": "3.6.11"
-=======
   "version_name": "3.6.12"
->>>>>>> ba3a0e8 (rollback: cleanup UI jump)
 }