fixed a leftover merge conflict

Author: dietmarkuehl

Makefile

@@ -53,19 +53,17 @@ build:
 test: build
 	cd $(BUILD); $(MAKE) test
 
-<<<<<<< HEAD
 ce:
 	@mkdir -p $(BUILD)
 	bin/mk-compiler-explorer.py $(BUILD)
-=======
+
 check:
 	@for h in `find include -name \*.hpp`; \
 	do \
 		from=`echo -n $$h | sed -n 's@.*Beman/\(.*\).hpp.*@\1@p'`; \
 		< $$h sed -n "/^ *# *include <Beman\//s@.*[</]Beman/\(.*\).hpp>.*@$$from \1@p"; \
 	done | tsort > /dev/null
 
->>>>>>> 3ed6667 (added completion_domain implementation)
 todo:
 	bin/mk-todo.py