From f86dac643081987c8994ab57a96640d5e91b342a Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sat, 2 Jun 2012 19:59:40 -0700
Subject: altoslib: Clean up random rebase failures

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 altoslib/AltosRecord.java | 1 -
 1 file changed, 1 deletion(-)

(limited to 'altoslib/AltosRecord.java')

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
 	 *
-- 
cgit v1.2.3