From c193af11e7f2d32b336127e123e496c5c16915e3 Mon Sep 17 00:00:00 2001
From: Jeff Carr <jcarr@wit.com>
Date: Thu, 28 Aug 2025 14:05:01 -0500
Subject: try merging patches together

---
 Makefile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index c0a9114..6b9c77b 100644
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,8 @@ VERSION = $(shell git describe --tags)
 BUILDTIME = $(shell date +%Y.%m.%d_%H%M)
 
 all: install
-	forged pull
-	# ./forged list
-	forged list
+	forged merge
+	# forged list
 
 build: goimports
 	GO111MODULE=off go build \
@@ -16,7 +15,7 @@ verbose:
 	GO111MODULE=off go build -v -x \
 		-ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"
 
-install:
+install: goimports
 	GO111MODULE=off go install \
 		-ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"
 
-- 
cgit v1.2.3