db log파일 commit 무시
pom.properties 경로 변경되는 것 무시 설정
Merge branch 'master' of https://github.com/kkj9406/lab303-easycompany-tutor.git
asdf
Merge branch 'master' of
https://github.com/kkj9406/lab303-easycompany-tutor.git

Conflicts:
	lab303-easycompany-tutor/db/sampledb.properties
	lab303-easycompany-tutor/target/m2e-wtp/web-resources/META-INF/maven/egovframe/easycompany/pom.properties