remove conflict scaffolding

2026-09-20 19:32:01 -04:00
parent 1d6b45b324
commit 55a0856b5f
2 changed files with 0 additions and 2 deletions
@@ -80,7 +80,6 @@ submit:
 	if [ $$status -ne 0 ]; then echo "WARNING: not all tests pass, see regress.log"; fi; \
 	echo "Wrote $$submission"

->>>>>>> upstream/main
 clean:
 	$(MAKE) -C sim/behav clean
 	$(MAKE) --no-print-directory clean-generated