Fixed what I tried to fix

Author: jantje

it.baeyens.arduino.monitor/src/it/baeyens/arduino/monitor/views/ScopeListener.java

@@ -9,14 +9,8 @@
 import java.util.LinkedList;
 import java.util.Queue;
 
-<<<<<<< HEAD
 import multichannel.Oscilloscope;
 import multichannel.OscilloscopeStackAdapter;
-=======
-import org.eclipse.nebula.widgets.oscilloscope.multichannel.Oscilloscope;
-import org.eclipse.nebula.widgets.oscilloscope.multichannel.OscilloscopeDispatcher;
-import org.eclipse.nebula.widgets.oscilloscope.multichannel.OscilloscopeStackAdapter;
->>>>>>> 8deb07cce97a2af36feca468a03be763cc148b84
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;

it.baeyens.arduino.monitor/src/it/baeyens/arduino/monitor/views/ScopeView.java

@@ -1,13 +1,9 @@
 package it.baeyens.arduino.monitor.views;
 
 import it.baeyens.arduino.arduino.Serial;
-<<<<<<< HEAD
 import multichannel.Oscilloscope;
 import multichannel.OscilloscopeDispatcher;
-=======
->>>>>>> 8deb07cce97a2af36feca468a03be763cc148b84
 
-import org.eclipse.nebula.widgets.oscilloscope.multichannel.Oscilloscope;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ControlAdapter;
 import org.eclipse.swt.events.ControlEvent;