fix conflict

Author: lunny

templates/repo/settings/options.tmpl

@@ -80,11 +80,7 @@
 					</div>
 					<div class="field {{if .Err_MirrorAddress}}error{{end}}">
 						<label for="mirror_address">{{.i18n.Tr "repo.mirror_address"}}</label>
-<<<<<<< HEAD
-						<input id="mirror_address" name="mirror_address" value="{{.Mirror.AddressNoCredentials}}" required>
-=======
 						<input id="mirror_address" name="mirror_address" value="{{MirrorFullAddress .Mirror}}" required>
->>>>>>> fix mirror address in template
 						<p class="help">{{.i18n.Tr "repo.mirror_address_desc"}}</p>
 					</div>
 					<div class="ui accordion optional field">