remove merge artifact

neil.hamilton · neil.hamilton · commit 598c69af392e · 2021-03-08T07:37:04.000Z
diff --git a/picosdk/ps5000a.py b/picosdk/ps5000a.py
@@ -954,7 +954,6 @@ class PS5000A_PWQ_CONDITIONS (Structure):
     ); """
 ps5000a.make_symbol("_SetTriggerDigitalPortProperties", "ps5000aSetTriggerDigitalPortProperties", c_uint32,
                     [c_int16, c_void_p, c_int16], doc)
-<<<<<<< HEAD
                     
 doc = """ PICO_STATUS ps5000aSetPulseWidthQualifierProperties
     (

Original file line number	Diff line number	Diff line change
`@@ -954,7 +954,6 @@ class PS5000A_PWQ_CONDITIONS (Structure):`
`954`	`954`	`); """`
`955`	`955`	`ps5000a.make_symbol("_SetTriggerDigitalPortProperties", "ps5000aSetTriggerDigitalPortProperties", c_uint32,`
`956`	`956`	`[c_int16, c_void_p, c_int16], doc)`
`957`		`-<<<<<<< HEAD`
`958`	`957`
`959`	`958`	`doc = """ PICO_STATUS ps5000aSetPulseWidthQualifierProperties`
`960`	`959`	`(`