resolve;

radical-cybertools · Jan 17, 2024 · 97517c6 · 97517c6
1 parent c9c9339
commit 97517c6
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/VERSION b/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
 1.47.0
-=======
-1.46.1
->>>>>>> master