MINOR Merge error

silverstripe · Mar 8, 2012 · 46a3bbf · 46a3bbf
1 parent 7ea1517
commit 46a3bbf
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/templates/AssetUploadField.ss b/templates/AssetUploadField.ss
@@ -10,7 +10,7 @@
 	<div class="ss-uploadfield-item-info">
 		<label class="ss-uploadfield-fromcomputer ss-ui-button ss-ui-action-constructive" title="<% _t('AssetUploadField.FROMCOMPUTERINFO', 'Upload from your computer') %>" data-icon="drive-upload">
 			<% _t('AssetUploadField.FROMCOMPUTER', 'Choose files from your computer') %>
-			<input id="$id" name="$getName" class="$extraClass ss-uploadfield-fromcomputer-fileinput" data-config="$configString" type="file"<% if $multiple %> multiple="multiple"<% end_if %>> title="<% _t('AssetUploadField.FROMCOMPUTER', 'Choose files from your computer') %>" />
+			<input id="$id" name="$getName" class="$extraClass ss-uploadfield-fromcomputer-fileinput" data-config="$configString" type="file"<% if $multiple %> multiple="multiple"<% end_if %> title="<% _t('AssetUploadField.FROMCOMPUTER', 'Choose files from your computer') %>" />
 		</label>
 
 		<div class="clear"><!-- --></div>