fix merge conflict
This commit is contained in:
		
						commit
						d9fb938e0a
					
				| 
						 | 
					@ -9,6 +9,7 @@ super + shift + {q,r}
 | 
				
			||||||
# close and kill
 | 
					# close and kill
 | 
				
			||||||
KP_Subtract
 | 
					KP_Subtract
 | 
				
			||||||
	bspc node -c
 | 
						bspc node -c
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ctrl + KP_Subtract
 | 
					ctrl + KP_Subtract
 | 
				
			||||||
	bspc node -k
 | 
						bspc node -k
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue