X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosRecord.java;h=10ef30613d32a31c037e1d8c9974b58e9d761fbb;hp=e4915af0039818e8eaf7ed005a0ff7f7fa102e8d;hb=f86dac643081987c8994ab57a96640d5e91b342a;hpb=dd43a2ae7594f062a8980d1756a07488ee54b447

diff --git a/altoslib/AltosRecord.java b/altoslib/AltosRecord.java
index e4915af0..10ef3061 100644
--- 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
 	 *