gitmerge 충돌 수정

This commit is contained in:
chicpro
2014-02-27 15:03:12 +09:00
8 changed files with 115 additions and 31 deletions

View File

@ -27,4 +27,6 @@
.sch_res_list ul {margin:0;padding:0;list-style:none}
.sch_res_list li {margin:0 0 10px;padding:0 10px 10px;border-bottom:1px solid #e9e9e9}
.sch_res_list a {text-decoration:none}
.sch_res_title {display:inline-block;margin:0 0 5px}
.sch_res_list p {margin:0 0 10px;line-height:1.8em}
.sch_more {padding:0 10px;text-align:right}