fixed github corrupting files..?

fix conflict

Author: CreativeRobotics

src/Commander.cpp

@@ -317,6 +317,7 @@ int Commander::quick(String cmd){
 	if(qSetHelp(cmd)) return 0;
 	return qSetSearch(cmd);
 }
+
 //==============================================================================================================
 bool Commander::quickSet(String cmd, int& var){
 	//look for the string, if found try and parse an int

src/Commander.h

@@ -62,6 +62,7 @@ typedef union {
 #define BUFFER_BUFFERING_PACKET 1
 //#define BUFFER_PACKET_RECEIVED 2
 
+
 typedef union {
   struct {
     uint32_t echoTerminal:1; 						//0
@@ -93,13 +94,8 @@ typedef union {
 //default is 	0b 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  1  0  0  0  1  0  1  1  1  0  1  1  0  0  0
 //const String CommanderVersionNumber = "3.0.0";
 const uint8_t majorVersion = 3;
-<<<<<<< HEAD
 const uint8_t minorVersion = 2;
 const uint8_t subVersion   = 0;
-=======
-const uint8_t minorVersion = 1;
-const uint8_t subVersion   = 1;
->>>>>>> 0b624a8c0aa15f844bec20cfd60166de984e0911
 
 typedef enum streamType_t{
 	UNDEFINED_STREAM 	= 0,
@@ -535,4 +531,4 @@ class Commander{
 	uint8_t primntDelayTime = 0; //
 };
 
-#endif //Commander_h
+#endif //Commander_h