From 3f66a5be21560affd7da5230b454b3ea47b2ba41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20S=C3=B6der?= <rolfkopman@gmail.com>
Date: Mon, 22 Jun 2020 15:23:51 +0200
Subject: [PATCH] Yepah!

---
 src/args.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/args.c b/src/args.c
index 41750d77..8c015cc4 100644
--- a/src/args.c
+++ b/src/args.c
@@ -96,13 +96,10 @@ static bool arg_cli(int argc, char **argv)
     (void) argc;
     (void) argv;
 
-<<<<<<< HEAD
-=======
     // Hack to get around ReadArgs overwriting dir names. Should be fixed.
     char *old = args[ARG_OLDDIR], *home = args[ARG_HOMEDIR];
     args[ARG_HOMEDIR] = args[ARG_OLDDIR] = NULL;
 
->>>>>>> axrt_test
     // Use the builtin commandline parser.
     struct RDArgs *rda = (struct RDArgs *) ReadArgs(tr(S_ARGS), (LONG *) args,
                                                     NULL);