From 403398b7a1db0c7072f97820e09eeea330250981 Mon Sep 17 00:00:00 2001
From: Sarah Jamie Lewis <sarah@openprivacy.ca>
Date: Tue, 25 Jul 2023 14:46:52 -0700
Subject: [PATCH] Patch Makefile

---
 Makefile | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 9e49925..dba6d91 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,6 @@ DEFAULT_GOAL: linux
 
 all: linux android windows
 
-<<<<<<< HEAD
 ARCH := $(shell uname -m)
 ARM_X_CC := aarch64-linux-gnu-gcc
 
@@ -17,12 +16,8 @@ ifneq (,$(shell which $(ARM_X_CC)))
 	LINUX_X_ARM = libCwtch.x.so
 endif
 
-linux: EXPERIMENTS ?= serverExperiment
-linux: libCwtch.so $(LINUX_X_ARM)
-=======
 linux: EXPERIMENTS ?= groupsExperiment serverExperiment
-linux: libCwtch.so
->>>>>>> 8e046b2 (Expose Search and new ServerList Functions)
+linux: libCwtch.so $(LINUX_X_ARM)
 
 macos: EXPERIMENTS ?= groupsExperiment serverExperiment
 macos: libCwtch.x64.dylib libCwtch.arm64.dylib