altoslib: Clean up random rebase failures

[fw/altos] / altosui / AltosSerial.java

diff --git a/altosui/AltosSerial.java b/altosui/AltosSerial.java
index 54cdcba7643b52b22524a2a175267d3a2dc43cfb..3abdb645393bc55621eddcf9d0665055c39cb536 100644 (file)
--- a/altosui/AltosSerial.java
+++ b/altosui/AltosSerial.java
@@ -264,7 +264,6 @@ public class AltosSerial extends AltosLink implements Runnable {
                flush_output();
        }
 
-<<<<<<< HEAD
        private int telemetry_len() {
                return Altos.telemetry_len(telemetry);
        }
@@ -386,8 +385,6 @@ public class AltosSerial extends AltosLink implements Runnable {
                remote = false;
        }
 
-=======
->>>>>>> bc5e669... altosui: Pull most of AltosSerial into AltosLink
        public void set_frame(Frame in_frame) {
                frame = in_frame;
        }