Projects >> openxc-android >>9b791ef86b1901377e0eae5fb14138cfee90a4ae

Chunk
Conflicting content 
 *
 * TODO this shouldn't represent two things.
 */
<<<<<<< HEAD
public class Degree extends Quantity {
=======
public class Degree extends Quantity implements Unit {
>>>>>>> 01a68facaae3f7bee006fd3c121fee96caa17549

    public Degree(Number value) {
        super(value);
Solution content 
 *
 * TODO this shouldn't represent two things.
 */
public class Degree extends Quantity {

    public Degree(Number value) {
        super(value);
File
Degree.java
Developer's decision
Manual
Kind of conflict
Class signature
Chunk
Conflicting content 
/**
 * Kilometer is an SI unit of distance.
 */
<<<<<<< HEAD
public class Kilometer extends Quantity {
=======
public class Kilometer extends Quantity implements Unit {
>>>>>>> 01a68facaae3f7bee006fd3c121fee96caa17549

    public Kilometer(Number value) {
        super(value);
Solution content 
/**
 * Kilometer is an SI unit of distance.
 */
public class Kilometer extends Quantity {

    public Kilometer(Number value) {
        super(value);
File
Kilometer.java
Developer's decision
Manual
Kind of conflict
Class signature
Chunk
Conflicting content 
/**
 * KilometersPerHour is an SI derived unit of velocity.
 */
<<<<<<< HEAD
public class KilometersPerHour extends Quantity {
=======
public class KilometersPerHour extends Quantity implements Unit {
>>>>>>> 01a68facaae3f7bee006fd3c121fee96caa17549

    public KilometersPerHour(Number value) {
        super(value);
Solution content 
/**
 * KilometersPerHour is an SI derived unit of velocity.
 */
public class KilometersPerHour extends Quantity {

    public KilometersPerHour(Number value) {
        super(value);
File
KilometersPerHour.java
Developer's decision
Manual
Kind of conflict
Class signature
Chunk
Conflicting content 
 *
 * e.g. my World of Warcraft character is Level 46.
 */
<<<<<<< HEAD
public class Level extends Quantity {
=======
public class Level extends Quantity implements Unit {
>>>>>>> 01a68facaae3f7bee006fd3c121fee96caa17549

    public Level(Number value) {
        super(value);
Solution content 
 *
 * e.g. my World of Warcraft character is Level 46.
 */
public class Level extends Quantity {

    public Level(Number value) {
        super(value);
File
Level.java
Developer's decision
Manual
Kind of conflict
Class signature
Chunk
Conflicting content 
/**
 * A Liter is a metric system unit of volume.
 */
<<<<<<< HEAD
public class Liter extends Quantity {
=======
public class Liter extends Quantity implements Unit {
>>>>>>> 01a68facaae3f7bee006fd3c121fee96caa17549

    public Liter(Number value) {
        super(value);
Solution content 
/**
 * A Liter is a metric system unit of volume.
 */
public class Liter extends Quantity {

    public Liter(Number value) {
        super(value);
File
Liter.java
Developer's decision
Manual
Kind of conflict
Class signature
Chunk
Conflicting content 
/**
 * A Meter is the base unit of length in the SI.
 */
<<<<<<< HEAD
public class Meter extends Quantity {
=======
public class Meter extends Quantity implements Unit {
>>>>>>> 01a68facaae3f7bee006fd3c121fee96caa17549

    public Meter(Number value) {
        super(value);
Solution content 
/**
 * A Meter is the base unit of length in the SI.
 */
public class Meter extends Quantity {

    public Meter(Number value) {
        super(value);
File
Meter.java
Developer's decision
Manual
Kind of conflict
Class signature
Chunk
Conflicting content 
/**
 * MetersPerSecond is an SI derived unit of velocity.
 */
<<<<<<< HEAD
public class MetersPerSecond extends Quantity {
=======
public class MetersPerSecond extends Quantity implements Unit {
>>>>>>> 01a68facaae3f7bee006fd3c121fee96caa17549

    public MetersPerSecond(Number value) {
        super(value);
Solution content 
/**
 * MetersPerSecond is an SI derived unit of velocity.
 */
public class MetersPerSecond extends Quantity {

    public MetersPerSecond(Number value) {
        super(value);
File
MetersPerSecond.java
Developer's decision
Manual
Kind of conflict
Class signature
Chunk
Conflicting content 
/**
 * A NewtonMeter is a unit of torque.
 */
<<<<<<< HEAD
public class NewtonMeter extends Quantity {
=======
public class NewtonMeter extends Quantity implements Unit {
>>>>>>> 01a68facaae3f7bee006fd3c121fee96caa17549

    public NewtonMeter(Number value) {
        super(value);
Solution content 
/**
 * A NewtonMeter is a unit of torque.
 */
public class NewtonMeter extends Quantity {

    public NewtonMeter(Number value) {
        super(value);
File
NewtonMeter.java
Developer's decision
Manual
Kind of conflict
Class signature
Chunk
Conflicting content 
/**
 * Percentage, a unit expressing a number as a fraction of 100.
 */
<<<<<<< HEAD
public class Percentage extends Quantity {
=======
public class Percentage extends Quantity implements Unit {
>>>>>>> 01a68facaae3f7bee006fd3c121fee96caa17549

    public Percentage(Number value) {
        super(value);
Solution content 
/**
 * Percentage, a unit expressing a number as a fraction of 100.
 */
public class Percentage extends Quantity {

    public Percentage(Number value) {
        super(value);
File
Percentage.java
Developer's decision
Manual
Kind of conflict
Class signature
Chunk
Conflicting content 
 *
 * This is commonly used with regard to engine speed (i.e. RPM).
 */
<<<<<<< HEAD
public class RotationsPerMinute extends Quantity {
=======
public class RotationsPerMinute extends Quantity implements Unit {
>>>>>>> 01a68facaae3f7bee006fd3c121fee96caa17549

    public RotationsPerMinute(Number value) {
        super(value);
Solution content 
 *
 * This is commonly used with regard to engine speed (i.e. RPM).
 */
public class RotationsPerMinute extends Quantity {

    public RotationsPerMinute(Number value) {
        super(value);
File
RotationsPerMinute.java
Developer's decision
Manual
Kind of conflict
Class signature