package com.google.tripmeout.frontend;

<<<<<<< HEAD
=======
import com.google.tripmeout.frontend.PlaceVisitModel;
import com.google.tripmeout.frontend.TripModel;
import com.google.tripmeout.frontend.PlaceVisitModel;
import java.util.List;

public interface TripStorage {
  public void addTrip(TripModel trip);
  public void removeTrip(String tripId);
  public TripModel getTrip(String tripId);
  public List<TripModel> getAllUserTrips(String userId);
  public List<PlaceVisitModel> getTripPlaceVisits(String tripId);
}

@@ -37,29 +37,8 @@
 d;%0A%0A
-%3C%3C%3C%3C%3C%3C%3C HEAD%0A=======%0A
 impo

remove merge conflict notation