Skip to content

Commit ab3024a

Browse files
committed
Bump dev version
1 parent f71044a commit ab3024a

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

reframe/__init__.py

+1-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66
import os
77
import sys
88

9-
<<<<<<< HEAD
10-
VERSION = '4.8.0-dev.0'
11-
=======
12-
VERSION = '4.7.1'
13-
>>>>>>> master
9+
VERSION = '4.8.0-dev.1'
1410
INSTALL_PREFIX = os.path.normpath(
1511
os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
1612
)

0 commit comments

Comments
 (0)