fixed version issue

RasaHQ · Oct 28, 2019 · 93341b4 · 93341b4
1 parent e5a87a9
commit 93341b4
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/rasa/version.py b/rasa/version.py
@@ -1,5 +1 @@
-<<<<<<< HEAD
-__version__ = "1.5.0a1"
-=======
 __version__ = "1.4.2"
->>>>>>> origin/1.4.x