From aed0f2be96674dd80120bb2d2ee3244397434c80 Mon Sep 17 00:00:00 2001
From: yannis <yannis@yannis-Laptop>
Date: Wed, 14 Feb 2018 17:41:00 +0100
Subject: [PATCH] oups

---
 src/mrbesen/cr/auto/clicker/Main.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/mrbesen/cr/auto/clicker/Main.java b/src/mrbesen/cr/auto/clicker/Main.java
index 8a77d6d..fdb7669 100644
--- a/src/mrbesen/cr/auto/clicker/Main.java
+++ b/src/mrbesen/cr/auto/clicker/Main.java
@@ -1,12 +1,9 @@
 package mrbesen.cr.auto.clicker;
 
-<<<<<<< HEAD
 import javax.swing.*;
-=======
 import java.awt.GraphicsDevice;
 import java.awt.GraphicsDevice.WindowTranslucency;
 import java.awt.GraphicsEnvironment;
->>>>>>> refs/heads/dev
 
 public class Main {