From fd791101b615a785ecc0f20423e2f9d25b8996bb Mon Sep 17 00:00:00 2001
From: bebbo <bebbo@bejy.net>
Date: Thu, 1 Dec 2016 12:55:03 +0100
Subject: [PATCH] @B fix last merge

---
 gas/read.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/gas/read.c b/gas/read.c
index 14b2670..b4458eb 100644
--- a/gas/read.c
+++ b/gas/read.c
@@ -239,11 +239,7 @@ static int get_line_sb PARAMS ((sb *));
 static void generate_file_debug PARAMS ((void));
 void ignore_rest_of_line (void);
 static void ignore_rest_of_line2 (int);
-<<<<<<< HEAD
 
-
-=======
->>>>>>> 2b6e426... @R support newer asm directives
 
 void
 read_begin ()