# Conflicts: # ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/ListGenericObjects.cs # ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/StorageCollection.cs # ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.Designer.cs # ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.cs