Projects >> iNaturalistAndroid >>05a23f668d9b8550d2bffdeaaac05ac72c0638e3

Chunk
Conflicting content 
        lon = mObservation.private_longitude == null ? mObservation.longitude : mObservation.private_longitude;
        acc = mObservation.positional_accuracy;

<<<<<<< HEAD
        Double lat, lon;
        lon = (mObservation.geoprivacy != null) && (!mObservation.geoprivacy.equals("open")) ? mObservation.private_longitude : mObservation.longitude;
        lat = (mObservation.geoprivacy != null) && (!mObservation.geoprivacy.equals("open"))  ? mObservation.private_latitude : mObservation.latitude;

        if ((lon != null) && (lat != null)) {
=======
        if (lat != null && lon != null) {
>>>>>>> 9971469afaa950a9013ea65a1f02ece9428ebd7b
            mMap.setOnMapClickListener(new GoogleMap.OnMapClickListener() {
                @Override
                public void onMapClick(LatLng latLng) {
Solution content 
        lon = mObservation.private_longitude == null ? mObservation.longitude : mObservation.private_longitude;
        acc = mObservation.positional_accuracy;

        if (lat != null && lon != null) {
            mMap.setOnMapClickListener(new GoogleMap.OnMapClickListener() {
                @Override
                public void onMapClick(LatLng latLng) {
File
ObservationViewerActivity.java
Developer's decision
Version 2
Kind of conflict
Attribute
If statement
Method invocation
Variable
Chunk
Conflicting content 
                }
            });

<<<<<<< HEAD
            Integer acc;

            acc = mObservation.positional_accuracy;

=======
>>>>>>> 9971469afaa950a9013ea65a1f02ece9428ebd7b
            LatLng latLng = new LatLng(lat, lon);
            mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(latLng, 15));
Solution content 
                }
            });

            LatLng latLng = new LatLng(lat, lon);
            mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(latLng, 15));
File
ObservationViewerActivity.java
Developer's decision
Version 2
Kind of conflict
Attribute
Variable