package com.google.tripmeout.frontend;

<<<<<<< HEAD
import com.google.tripmeout.frontend.PlaceVisitModel;

=======
>>>>>>> e878473... create PlaceVisit and Trip Storage interfaces
public interface PlaceVisitStorage {
  public void addPlaceVisit(PlaceVisitModel placeVisit);
  public void removePlaceVisit(String tripId, String placeId);
  public PlaceVisitModel getPlaceVisit(String tripId, String placeId);
  public void changePlaceVisitStatus(String tripId, String placeId, String newStatus);
<<<<<<< HEAD
}
=======
}
>>>>>>> e878473... create PlaceVisit and Trip Storage interfaces

@@ -33,29 +33,16 @@
 ntend;%0A%0A
-%3C%3C%3C%3C%3C%3C%3C HEAD%0A
 import c
@@ -92,81 +92,8 @@
 l;%0A%0A
-=======%0A%3E%3E%3E%3E%3E%3E%3E e878473... create PlaceVisit and Trip Storage interfaces%0A
 publ
@@ -407,94 +407,6 @@
 s);%0A
-%3C%3C%3C%3C%3C%3C%3C HEAD%0A%7D%0A=======%0A%7D%0A%3E%3E%3E%3E%3E%3E%3E e878473... create PlaceVisit and Trip Storage interfaces
+%7D
 %0A

fix rebasing issues