Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
@victorlei
victorlei committed May 28, 2018
1 parent 13e9a1a commit 844034e
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions smop/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,8 @@ MYFLAGS=
V = 3

all:
<<<<<<< HEAD
make -B FLAGS= liboctave.py
=======
make -B FLAGS= liboctave.py
$(COVERAGE) run -p main.py solver.m
$(COVERAGE) combine
>>>>>>> 245d9c8989e304a637840d6bcbd87d8905a96101

foo:
make -B FLAGS=-C liboctave.py
make -B FLAGS=-N liboctave.py
Expand Down

0 comments on commit 844034e

Please sign in to comment.