#2 PR 내용 rebase 후 merge 테스트 commit
escape CONFLICT board.view.php
Merge pull request #2 from akasima-pr-sender/develop-pr-mergetest1

* akasima-pr-sender-develop-pr-mergetest1:
  #2 PR 내용 rebase 후 merge 테스트 commit