omit
temp
temp
temp
temp

Conflicts:
	Motor Yard inventory/Motor Yard/DatabaseConnections.cs
	Motor Yard inventory/Motor Yard/bin/Debug/Motor Yard.exe
	Motor Yard inventory/Motor Yard/bin/Debug/Motor Yard.pdb
	Motor Yard inventory/Motor Yard/bin/Debug/web_inventory.accdb
	Motor Yard inventory/Motor Yard/obj/Debug/Motor Yard.exe
	Motor Yard inventory/Motor Yard/obj/Debug/Motor Yard.pdb
temp

Conflicts:
	Motor Yard inventory/Motor Yard/bin/Debug/web_inventory.accdb