Skip to content

Commit 0a41e20

Browse files
committed
remove merge artifact
1 parent 0b43234 commit 0a41e20

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

BUILDING

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ Before compiling we have to add the mxe/usr/bin directory to the PATH (so windre
5757

5858
Now compile:
5959

60-
>>>>>>> master
6160
make
6261

6362
If additionaly want an NSIS install:

0 commit comments

Comments
 (0)