From 780e0245b8cd183edefb8a4fd3a4554924735f21 Mon Sep 17 00:00:00 2001
From: David Rebbe <drebbe@intrepidcs.com>
Date: Thu, 12 Dec 2024 12:38:58 -0500
Subject: [PATCH] another merge conflict fix

---
 include/icsneo/icsneotypes.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/icsneo/icsneotypes.h b/include/icsneo/icsneotypes.h
index 7410d15..c2f7f57 100644
--- a/include/icsneo/icsneotypes.h
+++ b/include/icsneo/icsneotypes.h
@@ -141,6 +141,8 @@ typedef enum _icsneo_devicetype_t {
     icsneo_devicetype_vividcan,
     // neoOBD2 SIM
     icsneo_devicetype_obd2_sim,
+    // RAD-Galaxy 2
+    icsneo_devicetype_rad_galaxy2,
 
 
     // Must be last entry