hello
hello
from git_push.sh
Create README.md
from git_push.sh
Merge branch 'master' of https://github.com/cjinle/cms1
Merge remote-tracking branch 'origin/home'

Conflicts:
	application/config/config.php
	application/controllers/main.php
	application/models/common_model.php
	application/views/left.php
	application/views/nav.php
com
Merge branch 'master' of https://github.com/cjinle/cms1

Conflicts:
	application/controllers/main.php
	application/controllers/welcome.php
	application/models/common_model.php
	application/views/nav.php
Merge branch 'home' of https://github.com/cjinle/cms1 into home

Conflicts:
	README.md
	application/controllers/config.php
	application/controllers/welcome.php
	application/views/left.php
	application/views/login.php
	application/views/main/list2.php
Merge branch 'home' of https://github.com/cjinle/cms1 into home

Conflicts:
	.gitignore