fix merge

Author: wxiaoguang

templates/repo/create.tmpl

@@ -118,7 +118,7 @@
 								<div class="menu">
 									<div class="item" data-value="">{{.locale.Tr "repo.issue_labels_helper"}}</div>
 									{{range .LabelTemplateFiles}}
-										<div class="item" data-value="{{.FileName}}">{{.DisplayName}}<br/><i>({{.Description}})</i></div>
+										<div class="item" data-value="{{.FileName}}">{{.DisplayName}}<br><i>({{.Description}})</i></div>
 									{{end}}
 								</div>
 							</div>

templates/repo/issue/labels/label_load_template.tmpl

@@ -11,7 +11,7 @@
 						<div class="default text">{{.locale.Tr "repo.issues.label_templates.helper"}}</div>
 						<div class="menu">
 							{{range .LabelTemplateFiles}}
-								<div class="item" data-value="{{.FileName}}">{{.DisplayName}}<br/><i>({{.Description}})</i></div>
+								<div class="item" data-value="{{.FileName}}">{{.DisplayName}}<br><i>({{.Description}})</i></div>
 							{{end}}
 						</div>
 						{{svg "octicon-triangle-down" 18 "dropdown icon"}}