line 2 changed
Merge remote-tracking branch 'origin/KFC' into dsmp

Conflicts:
	df12/src/pages/opportunitycreateinvoice.page
commited
Merge branch 'KFC' of github.com:devo2smaruthi/TestSalesforce into KFC
Merge branch 'dsmp' into KFC