merge error corrected

fhesse · Apr 30, 2012 · 266f224 · 266f224
1 parent ea0d695
commit 266f224
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -226,15 +226,8 @@ soundman:
 
 
 .PHONY: confsubmodule
-<<<<<<< HEAD
 confsubmodule:	
 	@if [ `uname` = "Linux" ]; then \
-=======
-confsubmodule:
-##! line below gives the following error on MAC: /bin/bash: line 0: [: =: unary operator expected
-##! but now problem here, since "MAC" is passed over: call: selforg/configure --prefix=/Users/frank --system=MAC --type=DEVEL
-	@if [ `uname -a | sed 's/\(\w*\).*/\1/'` = "Linux" ]; then \
->>>>>>> cbd5cd4596e3883b38afe07327dcd5c4d28ecea7
 		System="LINUX"; else System="MAC"; fi; \
 	if [ -n "$(MODULE)" ]; then \
 	    CMD="$(MODULE)/configure --prefix=$(PREFIX) --system=$$System --type=$(TYPE)"; \