终于连上网络了。。
Merge branch 'master' of git@github.com:minusone13/InvoicingSystem.git

Conflicts:
	AlertBillPO.txt
	CashPaymentPO.txt
	PaymentPO.txt
	SaleSheetPO.txt
is there somthing wrong?
Merge branch 'master' of git@github.com:minusone13/InvoicingSystem.git

Conflicts:
	SaleSheetPO.txt
我再来试一下。