From 7af1d2e4590783a0eea5553aa2664c8961985cb8 Mon Sep 17 00:00:00 2001
From: mdblack98 <mdblack98@yahoo.com>
Date: Sun, 26 Apr 2020 17:01:45 -0500
Subject: [PATCH] Fix bad commit of newcat.h

---
 rigs/yaesu/newcat.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rigs/yaesu/newcat.h b/rigs/yaesu/newcat.h
index f588d602e..a83ab1395 100644
--- a/rigs/yaesu/newcat.h
+++ b/rigs/yaesu/newcat.h
@@ -188,6 +188,9 @@ int newcat_set_trn(RIG * rig, int trn);
 int newcat_get_trn(RIG * rig, int *trn);
 int newcat_set_channel(RIG * rig, const channel_t * chan);
 int newcat_get_channel(RIG * rig, channel_t * chan, int read_only);
->>>>>>> 5eb5b6f3d8c543332e31c43d128fadbcb5604a5c
+rmode_t newcat_rmode(char mode);
+char newcat_modechar(rmode_t rmode);
+rmode_t newcat_rmode_width(RIG *rig, vfo_t vfo, char mode, pbwidth_t *width);
+
 
 #endif /* _NEWCAT_H */