Resolve merge conflict

Signed-off-by: Nick Gerakines <nick@gerakines.net>
ngerakines · Mar 11, 2009 · fc21746 · fc21746
1 parent 1164c68
commit fc21746
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -1,8 +1,5 @@
 LIBDIR=`erl -eval 'io:format("~s~n", [code:lib_dir()])' -s init stop -noshell`
-<<<<<<< HEAD:Makefile
-=======
 VERSION=0.1
->>>>>>> 98ff3f396fabf7485fe2befa69abdaaa2b88d3bc:Makefile
 
 all:
 	mkdir -p ebin/