Pull->commit
削除
Merge branch 'master' of https://github.com/genya2000/wpcustom

Conflicts:
	wp-content/themes/ypj_pj/functions.php