From 91527ccd54b85d6db4bee71b47728c7dec60f816 Mon Sep 17 00:00:00 2001
From: Michael Black W9MDB <mdblack98@yahoo.com>
Date: Tue, 30 Mar 2021 11:25:13 -0500
Subject: [PATCH] Fix merge error in ft857.c
 https://github.com/Hamlib/Hamlib/issues/636

---
 rigs/yaesu/ft857.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/rigs/yaesu/ft857.c b/rigs/yaesu/ft857.c
index b4d6df76a..3b0768ef5 100644
--- a/rigs/yaesu/ft857.c
+++ b/rigs/yaesu/ft857.c
@@ -155,11 +155,7 @@ const struct rig_caps ft857_caps =
     RIG_MODEL(RIG_MODEL_FT857),
     .model_name =     "FT-857",
     .mfg_name =       "Yaesu",
-<<<<<<< HEAD
     .version =        "20210330.0",
-=======
-    .version =        "20210329.0",
->>>>>>> e70d33f59db41d586d76a7db2d6a3427019f7325
     .copyright =      "LGPL",
     .status =         RIG_STATUS_STABLE,
     .rig_type =       RIG_TYPE_TRANSCEIVER,