diff options
| author | Keith Packard <keithp@keithp.com> | 2012-06-02 19:59:40 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-06-02 19:59:40 -0700 |
| commit | f86dac643081987c8994ab57a96640d5e91b342a (patch) | |
| tree | cc175f18f8930c04be16bb4c12b756782ecff568 /altoslib/AltosRecord.java | |
| parent | dd43a2ae7594f062a8980d1756a07488ee54b447 (diff) | |
altoslib: Clean up random rebase failures
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altoslib/AltosRecord.java')
| -rw-r--r-- | altoslib/AltosRecord.java | 1 |
1 files changed, 0 insertions, 1 deletions
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 * |