resolve merge conflict

Author: soundanalogous

Firmata.cpp

@@ -120,7 +120,10 @@ void FirmataClass::setFirmwareNameAndVersion(const char *name, byte major, byte
 
   // parse out ".cpp" and "applet/" that comes from using __FILE__
   extension = strstr(name, ".cpp");
-  filename = strrchr(name, '/') + 1; //points to slash, +1 gets to start of filename
+  if (strrchr(name, '/') != NULL)
+    filename = strrchr(name, '/') + 1; //points to slash, +1 gets to start of filename
+  else
+    filename = strrchr(name, '\\') + 1; //points to slash, +1 gets to start of filename
   // add two bytes for version numbers
   if(extension && filename) {
     firmwareVersionCount = extension - filename + 2;

Firmata.h

@@ -117,7 +117,7 @@ class FirmataClass
     void detach(byte command);
 
 private:
-    Stream &FirmataSerial;
+    Stream &FirmataSerial;    
 /* firmware name and version */
     byte firmwareVersionCount;
     byte *firmwareVersionVector;