Explorar o código

Fix for previous commit

Nicolas Petton %!s(int64=11) %!d(string=hai) anos
pai
achega
17b36be465
Modificáronse 1 ficheiros con 0 adicións e 4 borrados
  1. 0 4
      st/Helios-KeyBindings.st

+ 0 - 4
st/Helios-KeyBindings.st

@@ -572,11 +572,7 @@ showWidget: aWidget
 renderBindingActionFor: aBinding on: html
 	html span class: 'command'; with: [
 		html strong 
-<<<<<<< Updated upstream
-			class: 'pull-right'; 
-=======
 			class: 'label'; 
->>>>>>> Stashed changes
 			with: aBinding shortcut asLowercase.
   		html a 
         	class: 'action';