Projects information

Chunk

Conflicting content
degreeFormat = "00"; } StringBuilder result = new StringBuilder(); <<<<<<< HEAD result.append(NumberFormat.getFormat(degreeFormat).format(degrees)) ======= result.append(sign) .append(NumberFormat.getFormat("00").format(degrees)) >>>>>>> 08fb8c318846d8a7b8e572041c63d51ff1cc98c8 .append(":") .append(NumberFormat.getFormat("00").format(minutes)) .append(":")

Conflicting content

        	degreeFormat = "00";
        }
        StringBuilder result = new StringBuilder();
<<<<<<< HEAD
        result.append(NumberFormat.getFormat(degreeFormat).format(degrees))
=======
        result.append(sign)
              .append(NumberFormat.getFormat("00").format(degrees))
>>>>>>> 08fb8c318846d8a7b8e572041c63d51ff1cc98c8
              .append(":")
              .append(NumberFormat.getFormat("00").format(minutes))
              .append(":")

Solution content
degreeFormat = "00"; } StringBuilder result = new StringBuilder(); result.append(sign) .append(NumberFormat.getFormat(degreeFormat).format(degrees)) .append(":") .append(NumberFormat.getFormat("00").format(minutes)) .append(":")

Solution content

        	degreeFormat = "00";
        }
        StringBuilder result = new StringBuilder();
        result.append(sign)
        	  .append(NumberFormat.getFormat(degreeFormat).format(degrees))
              .append(":")
              .append(NumberFormat.getFormat("00").format(minutes))
              .append(":")

File
Conversions.java

Developer's decision
Manual

Kind of conflict
Method invocation

Projects >> nubbles >>b7b5ca82bef1b8b35bca4551d1d69e207540ea41