Delete <<<head (conflict) on note_show.html
Delete <<<head (conflict) on note_show.html


Former-commit-id: 7e78084b7c9f2dfeba1bee2fb794fb2bb2546ba4 [formerly 9e55c17f90833a89846307fe221be2f1ec48421b] [formerly ecfd219980bd9f97f642a7a1b3f86eef2ee498d3 [formerly d5bb008123c38d0e1cf4f4742da90a60aa20456f]]
Former-commit-id: 6281ee81433f3b98b038df5bcb3dd18fb1eef0ec [formerly e3ee49b716d1078f5b3ad890415e2158197d0d87]
Former-commit-id: 6ea41f881f7134b450a412f20e5eb73f687cf87c
ioGrow/iogrowCRM,ioGrow/iogrowCRM,ioGrow/iogrowCRM