# Conflicts: # ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType.cs # ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection.cs
# Conflicts: # ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType.cs # ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection.cs