ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix conflict

This commit is contained in:
GameDragon2k 2017-11-23 08:06:33 -05:00
parent cfe59bcf2a
commit 4f9119d42e
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.common
View File

@ -1474,12 +1474,9 @@ ifeq ($(HAVE_NETWORKING), 1)
ifeq ($(HAVE_CHEEVOS), 1) ifeq ($(HAVE_CHEEVOS), 1)
DEFINES += -DHAVE_CHEEVOS DEFINES += -DHAVE_CHEEVOS
OBJ += cheevos/cheevos.o \ OBJ += cheevos/cheevos.o \
<<<<<<< HEAD
cheevos/var.o \ cheevos/var.o \
cheevos/cond.o \ cheevos/cond.o \
=======
cheevos/badges.o \ cheevos/badges.o \
>>>>>>> Add files to handle all cheevos badges.
$(LIBRETRO_COMM_DIR)/utils/md5.o $(LIBRETRO_COMM_DIR)/utils/md5.o
endif endif