Removed comments added by TortoiseGit from PicoVNA_S_Parameter_Example.m, PicoVNA_S_Parameter_Multi_Device_Example.m and connectVNA.m

Author: neil-hamilton

examples/PicoVNA_S_Parameter_Example.m

@@ -37,22 +37,18 @@
 
 %% Load Calibration
 % Load a calibration and settings file.
-<<<<<<< HEAD:examples/PicoVNA_Rapid_Block_Example.m
 % This needs to be generated and saved using the PicoVNA2 software.
 
 % Replace DefCal.cal with the correct calibration for your device, 'Pico TD
 % demo with limits [Serial#].cal'.
 picoVNACOMObj.LoadCal('?');
 
 %%
-ans1 = picoVNACOMObj.SetEnhance('BW', 140000);
-=======
 % This needs to be generated and saved using the PicoVNA 2 software.
 %
 % Replace |DefCal.cal| with the correct calibration for your device, |Pico TD
 % demo with limits [Serial#].cal|.
 picoVNACOMObj.LoadCal('DefCal.cal');
->>>>>>> 2cfc4b692078fea93da97288c75f6be6cdb49fa4:examples/PicoVNA_S_Parameter_Example.m
 
 %% Stop button for exiting loop
 % Create a stop button for exiting rapid block capture and for displaying

examples/PicoVNA_S_Parameter_Multi_Device_Example.m

@@ -36,7 +36,6 @@
 
 picoVNACOMObj = connectVNA_SN('DC2LZ9IY');
 picoVNACOMObj_1 = connectVNA_SN_1('DC2L240G');
-%%
 picoVNACOMObj_2 = connectVNA_SN_2('DC2NXKID');
 
 %% Load Calibration

functions/connectVNA.m

@@ -1,13 +1,6 @@
-<<<<<<< HEAD
-%% ConnectVNA_SN
-%
-%% Description
-% CONNECTVNA_SN Creates PicoVNA COM object.
-=======
 %% connectVNA
 %
 %% Description
->>>>>>> 2cfc4b692078fea93da97288c75f6be6cdb49fa4
 %
 % |connectVNA()| creates and returns a COM object to a PicoVNA device.
 %