altoslib: Clean up random rebase failures

[fw/altos] / altoslib / AltosRecord.java

diff --git a/altoslib/AltosRecord.java b/altoslib/AltosRecord.java
index e4915af0039818e8eaf7ed005a0ff7f7fa102e8d..10ef30613d32a31c037e1d8c9974b58e9d761fbb 100644 (file)
--- a/altoslib/AltosRecord.java
+++ b/altoslib/AltosRecord.java
@@ -82,7 +82,6 @@ public class AltosRecord implements Comparable <AltosRecord> {
 
        public AltosRecordCompanion companion;
 
->>>>>>> 5a249bc... altosui: Complete split out of separate java library
        /*
         * Values for our MP3H6115A pressure sensor
         *