From 984dc8668f1fedacf553f279a828acdebffc5625 Mon Sep 17 00:00:00 2001
From: Tracy Ward <coderjoe69@yahoo.com>
Date: Tue, 23 Mar 2021 03:33:26 -0400
Subject: [PATCH] fix minor merge error in comment

---
 src/arch/Lights/LightsDriver_Linux_stac.h | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/src/arch/Lights/LightsDriver_Linux_stac.h b/src/arch/Lights/LightsDriver_Linux_stac.h
index a46813dbf1..a6dc1f9d4a 100644
--- a/src/arch/Lights/LightsDriver_Linux_stac.h
+++ b/src/arch/Lights/LightsDriver_Linux_stac.h
@@ -4,7 +4,6 @@
 #define LightsDriver_Linux_stac_H
 
 /*
-<<<<<<< ours
  * -------------------------- NOTE -------------------------- 
  * 
  * This driver needs user read/write access to the icedragon.io stac.
@@ -17,20 +16,6 @@
  * Refer to your distrobution's documentation on how to properly apply a udev rule.
  * 
  * -------------------------- NOTE -------------------------- 
-=======
- * -------------------------- NOTE --------------------------
- *
- * This driver needs user read/write access to the icedragon.io stac.
- * This can be achieved by using a udev rule like this:
- *
- * (player 1 then player 2)
- * SUBSYSTEMS=="usb", ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="eb5b", OWNER="dance", GROUP="dance", MODE="0660"
- * SUBSYSTEMS=="usb", ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="eb5a", OWNER="dance", GROUP="dance", MODE="0660"
- *
- * Refer to your distrobution's documentation on how to properly apply a udev rule.
- *
- * -------------------------- NOTE --------------------------
->>>>>>> theirs
  */
 
 #include "arch/Lights/LightsDriver.h"