Resolved merged conflicts simply by replacing "theSerial" with "theStream" and "_serial" with "_stream"
It successfully compiles on UNO, Mega2560, Teensy 1,2,3, Teensy++ 2 and 3.
There are no functional changes in the code behavior, only what class objects are assigned to the *theStream, based on Platform or Processor type.
Resolved merged conflicts simply by replacing "theSerial" with "theStream" and "_serial" with "_stream" It successfully compiles on UNO, Mega2560, Teensy 1,2,3, Teensy++ 2 and 3.
There are no functional changes in the code behavior, only what class objects are assigned to the *theStream, based on Platform or Processor type.