df
ghjjhkj
jil
gtyt
connit1
rr
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	CRM_Project/CRM_Project.v12.suo
	CRM_Project/CRM_User_Interface/App.config
	CRM_Project/CRM_User_Interface/obj/Debug/ADD_Tax.g.i.cs
	CRM_Project/CRM_User_Interface/obj/Debug/Add
Product/Add_Products.g.i.cs
	CRM_Project/CRM_User_Interface/obj/Debug/AdminLogin.g.i.cs
	CRM_Project/CRM_User_Interface/obj/Debug/Admin_Dashbord.g.i.cs
	CRM_Project/CRM_User_Interface/obj/Debug/App.g.i.cs
	CRM_Project/CRM_User_Interface/obj/Debug/CRM_AdminDashbord.g.i.cs
	CRM_Project/CRM_User_Interface/obj/Debug/CRM_MainDashbord.g.i.cs
	CRM_Project/CRM_User_Interface/obj/Debug/CRM_MainForm.g.i.cs
	CRM_Project/CRM_User_Interface/obj/Debug/CRM_Main_Login.g.i.cs

	CRM_Project/CRM_User_Interface/obj/Debug/CRM_User_Interface.csproj.ResolveComReference.cache
	CRM_Project/CRM_User_Interface/obj/Debug/MainWindow.g.i.cs

	CRM_Project/CRM_User_Interface/obj/Debug/frmCRM_DealerDetailsEdit.g.i.cs
	CRM_Project/CRM_User_Interface/obj/Debug/frmCRM_EmpDetailsEdit.g.i.cs
mno
Merge branch 'master'
Merge branch 'master'
mno
ddddd
hhg
Mno