From dfc80bf956a344dcd185f6db2980af7919c52e0d Mon Sep 17 00:00:00 2001 From: Cameron Katri Date: Wed, 5 May 2021 15:00:19 -0400 Subject: Fix merge conflicts --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index fbb0be58..4aa82ef0 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ config.h: update: TEMP=$$(mktemp -d); \ - cd ~/Documents/BSD/NetBSD; \ + cd ~/Documents/NetBSD; \ git format-patch -o $$TEMP $(shell cat upstream-commit) games; \ git rev-list HEAD -1 games/ > $(ROOT)/upstream-commit; \ cd $(ROOT); \ -- cgit v1.2.3-56-ge451