actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix minor merge error in comment

Browse Source
This commit is contained in:
Tracy Ward
2021-03-23 03:33:26 -04:00
parent f1f76bc71b
commit 984dc8668f
1 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/arch/Lights/LightsDriver_Linux_stac.h
-15
View File
@@ -4,7 +4,6 @@
#define LightsDriver_Linux_stac_H #define LightsDriver_Linux_stac_H
/* /*
<<<<<<< ours
* -------------------------- NOTE -------------------------- * -------------------------- NOTE --------------------------
* *
* This driver needs user read/write access to the icedragon.io stac. * 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. * Refer to your distrobution's documentation on how to properly apply a udev rule.
* *
* -------------------------- NOTE -------------------------- * -------------------------- 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" #include "arch/Lights/LightsDriver.h"