From: Michael D. Lowis <mike.lowis@gentex.com>
Date: Fri, 22 Mar 2019 21:27:44 +0000 (-0400)
Subject: resolve merge conflict
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=5f21789bcc6d9a21d5983cdf945e62cc1cd1241f;p=proto%2Fsclpl.git

resolve merge conflict
---

5f21789bcc6d9a21d5983cdf945e62cc1cd1241f
diff --cc Makefile
index 738b959,c477b6a..e9204bd
--- a/Makefile
+++ b/Makefile
@@@ -30,7 -30,7 +30,8 @@@ OBJS = source/main.o    
         source/codegen.o
  
  .PHONY: all specs tests
- all: sclpl tests
++
+ all: ${BIN} tests
  
  lib${BIN}.a: ${OBJS}
  	${AR} ${ARFLAGS} $@ $^