Fix merge conflict

reframe-hpc · Jan 23, 2025 · bc63e84 · bc63e84
1 parent 09d2197
commit bc63e84
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/reframe/__init__.py b/reframe/__init__.py
@@ -6,11 +6,7 @@
 import os
 import sys
 
-<<<<<<< HEAD
 VERSION = '4.8.0-dev.2'
-=======
-VERSION = '4.7.3'
->>>>>>> master
 INSTALL_PREFIX = os.path.normpath(
     os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
 )