From 4f9119d42e3940e9a5420d95acccf6108f236e0c Mon Sep 17 00:00:00 2001
From: GameDragon2k <gdragon2k@yahoo.com>
Date: Thu, 23 Nov 2017 08:06:33 -0500
Subject: [PATCH] Fix conflict

---
 Makefile.common | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index 737820a16c..7aeea49c68 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1474,12 +1474,9 @@ ifeq ($(HAVE_NETWORKING), 1)
    ifeq ($(HAVE_CHEEVOS), 1)
       DEFINES += -DHAVE_CHEEVOS
       OBJ += cheevos/cheevos.o \
-<<<<<<< HEAD
          cheevos/var.o \
          cheevos/cond.o \
-=======
-          cheevos/badges.o \
->>>>>>> Add files to handle all cheevos badges.
+         cheevos/badges.o \
          $(LIBRETRO_COMM_DIR)/utils/md5.o
    endif