From be175e9dd9303df4f4a511a78a54c689f8d765ce Mon Sep 17 00:00:00 2001
From: Michael Black <mdblack98@yahoo.com>
Date: Mon, 13 Apr 2020 08:19:24 -0500
Subject: [PATCH] Fix merge conflict

---
 rigs/kenwood/ts480.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/rigs/kenwood/ts480.c b/rigs/kenwood/ts480.c
index e0a4b4360..792a02842 100644
--- a/rigs/kenwood/ts480.c
+++ b/rigs/kenwood/ts480.c
@@ -631,11 +631,7 @@ const struct rig_caps ts480_caps =
  */
 const struct rig_caps pt8000a_caps =
 {
-<<<<<<< HEAD
-    RIG_MODEL(RIG_MODEL_HILBERLING_PT8000A),
-=======
     RIG_MODEL(RIG_MODEL_PT8000A),
->>>>>>> 66525c81f817818424e3b9a7efb2d2cc67069593
     .model_name = "PT-8000A",
     .mfg_name = "Hilberling",
     .version = BACKEND_VER ".1",