From 4c1a9a9df7411a08c0c2d8ea5ee3c9c80052fe26 Mon Sep 17 00:00:00 2001
From: Duke Leto <duke@leto.net>
Date: Sun, 25 Oct 2020 23:42:22 -0400
Subject: [PATCH] Delete a git script we don't need

---
 resolve.sh | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100755 resolve.sh

diff --git a/resolve.sh b/resolve.sh
deleted file mode 100755
index 548e71dee..000000000
--- a/resolve.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-for f in $(git diff --name-only --diff-filter=U | cat); do
-   echo "Resolve conflict in $f ..."
-   git checkout --theirs $f
-done
-
-for f in $(git diff --name-only --diff-filter=U | cat); do
-   echo "Adding file $f ..."
-   git add $f
-done
-