Projects >> drawgeo >>e790d9098191072923ecdac914c483490951568d

Chunk
Conflicting content 
import org.json.JSONArray;
import org.json.JSONObject;

<<<<<<< HEAD
import pt.drawgeo.canvas.CanvasActivity;
import pt.drawgeo.utility.*;
=======
import pt.drawgeo.utility.Configurations;
import pt.drawgeo.utility.Connection;
>>>>>>> ccb0694630d87928adee0e8a5840af2c5cc4813b
import android.app.Dialog;
import android.app.ProgressDialog;
import android.content.Context;
Solution content 
import org.json.JSONArray;
import org.json.JSONObject;

import pt.drawgeo.utility.Configurations;
import pt.drawgeo.utility.Connection;
import android.app.Dialog;
import android.app.ProgressDialog;
import android.content.Context;
File
MapsActivity.java
Developer's decision
Version 2
Kind of conflict
Import