confrict test
first commit
first commit
Merge branch 'dev1' of git@github.com:mamezon/testrepo.git into dev1
.gitignore設定変更後のコミット
Merge pull request #3 from mamezon/dev1

Dev1 to master