Commit 5dd26f1cc9034ae026128b4d1ae5d13eb89b32c0

Authored by Ali B
1 parent 88c4957a

Fixed merge errors

Risiko/app/src/main/java/activity/Incident.java
... ... @@ -92,7 +92,7 @@ public class Incident extends AppCompatActivity {
92 92 chosenEventId = ((dataclasses.Incident) lv.getItemAtPosition(position)).getId();
93 93 showEventPopup((dataclasses.Incident) lv.getItemAtPosition(position));
94 94  
95   - Api.get().newAccesslogEntry(chosenEventId, "Timon", "Ambulansepersonell", logDate).enqueue(new Callback<String>() {
  95 + Api.getInstance().newAccesslogEntry(chosenEventId, "Timon", "Ambulansepersonell", logDate).enqueue(new Callback<String>() {
96 96 @Override
97 97 public void onResponse(Call<String> call, Response<String> response) {
98 98  
... ...
Risiko/app/src/main/java/api/Endpoints.java
... ... @@ -35,7 +35,7 @@ public interface Endpoints {
35 35 // String BASEURL = "http://192.168.38.200:3000/";
36 36  
37 37 //HOS KRISTIN
38   - String BASEURL = "http://192.168.84.71:3000/";
  38 +// String BASEURL = "http://192.168.84.71:3000/";
39 39 //String BASEURL = "http://172.20.10.2:3000/";
40 40  
41 41 //ØYVIN FIX
... ...