From 70713e253504fdccf70c1c9e1da421fd9ef211f3 Mon Sep 17 00:00:00 2001
From: Rumble <tbamud@github.com>
Date: Thu, 28 Aug 2014 23:10:44 -0500
Subject: [PATCH] cleanup

---
 src/interpreter.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/interpreter.c b/src/interpreter.c
index a8fc64f..48336bf 100644
--- a/src/interpreter.c
+++ b/src/interpreter.c
@@ -699,11 +699,7 @@ static void perform_complex_alias(struct txt_q *input_q, char *orig, struct alia
 	write_point += strlen(tokens[num]);
       } else if (*temp == ALIAS_GLOB_CHAR) {
         skip_spaces(&orig);
-<<<<<<< HEAD
-	strcpy(write_point, orig);		/* strcpy: OK */
-=======
         strcpy(write_point, orig);		/* strcpy: OK */
->>>>>>> f81cf2451717859aecaebb3ca07daf7b9d9a45a5
 	write_point += strlen(orig);
       } else if ((*(write_point++) = *temp) == '$')	/* redouble $ for act safety */
 	*(write_point++) = '$';