From 566702d0eb2899df0ecd694c6418559c7a116c2e Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Wed, 29 Jan 2020 16:14:20 -0500
Subject: [PATCH] Removed two files that were accidentally committed

---
 merge/Merge.class | Bin 1312 -> 0 bytes
 merge/Merge.java  |  36 ------------------------------------
 2 files changed, 36 deletions(-)
 delete mode 100644 merge/Merge.class
 delete mode 100644 merge/Merge.java

diff --git a/merge/Merge.class b/merge/Merge.class
deleted file mode 100644
index 781b5219fcf6e6950d03bce1e78ce7de233c10b3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1312
zcmaJ=%TgOh6g`b*)M6O%kSv0dVB{ATdVr(YBoPDxwz091a9NbAu&byVqy`VsD|*Dv
z4`i8TmdTQ}voKVsvUe=<HC}sRe0l~0Ny=80Zr^+R^zC!c?fK{3->(2%$2|*CT#*>J
z(1WWMB1l@8K&qD}9YV%J7Ly@NNnDfo%0eG<7A$<N&2?>VNK9K8#5WS(N_-~}oOSDN
zXHFoHoOmQ)+-y{oz`%-ISH*5^Q?=Hd%_=iS&2j4j!^tNrJI>F}RMn|(Pn9|?x4u22
z4_ddMmsPXlHtKDOynxx{R!3kc>EqqT)RJ3O9yVO+IOQJ;PSdOHah;Z!VOy+IYIIv=
zrLhbOs<o{q^@TRhAtqpZmme3?xmg=uVpQUL8*`Yq@dFkFAhBrUCT0c364_7v5^U*1
z$;Iy0mTIZWL*-OdOCa)LLzD57`o>XhZrQkvB^!4%si+6^6j^)PYCO}5*|>{k%HVY%
zFn9`C-P}=SD&wDGE6b}V+WiaYt1A#YmhiulpQ%~;rQK0APDwp?S=vZ0>zM=^T?Vm}
z0X)znVO8bSX3pGyCM_Vnxm7vp=;`GA=Dpd4c)Frrhrqey#Q)y{TP{}{ZElC1N~P3o
zHe0IQRuzGfvu&K{#G<&scO2#W1_EGN#At^ZjdJBMVW##VUeFQvj5g>cd(n###Q7a)
z=rb4`Ixv5Lp7m59w}-%r=Nj5Ac&@44Vk(%+8!4H~n>racnac+=`!I}sn5UPFvpo3y
z^ugu@VRG!pI0lgB$1{x~<jHxCtUo8pAfYda=R@@Ah{rHV6ZrEl1S9e#LVE2zUUhr`
zYyALy>+H<lLwH3LL^1sm{p-a;gbB_PvwQR=eTb#ZA)?$G*u_jS!~D=La(<jHW((QZ
zd4s4?qGEnFk~cGP)5A%fi5ss!#^MEO-obqo*;ESi*f?Ixq+Y{M=rG=Zf{uGU?emlY
z6ePrGkoxNhq$om$0^Fbg^El5Fah^DjUonQ?kihR0?+;vN23Uag4jG9tiG;+3w}=$!
lg_dY;@qfgkro=@bz=<XxXso~y@27W>B~BF=xa1ML{2m|m1hD`B

diff --git a/merge/Merge.java b/merge/Merge.java
deleted file mode 100644
index a1be81689..000000000
--- a/merge/Merge.java
+++ /dev/null
@@ -1,36 +0,0 @@
-import java.awt.Desktop;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-
-public class Merge {
-    public static void main(String[] args) throws IOException {
-        File ancestor = new File(args[0]);
-        File current = new File(args[1]);
-        File other = new File(args[2]);
-        int markerLenth = Integer.parseInt(args[3]);
-        File original = new File(args[4]);
-
-        // HOWTO:
-        //  1. Add contents of .gitconfig to your local .git/config
-        //  2. This script will run for any merge conflicts
-
-        // TODO auto resolve merge conflicts in `current`
-        //  - imports
-
-        boolean failed = true;
-        if (failed) {
-            System.exit(1); // Auto merge failed
-        }
-    }
-
-    private static String read(File file) throws IOException {
-        byte[] encoded = Files.readAllBytes(file.toPath());
-        return new String(encoded, StandardCharsets.UTF_8);
-    }
-}