11 years ago · 2cfea37f24
--- a/vim/spell/en.utf-8.add
+++ b/vim/spell/en.utf-8.add
@@ -55,6 +55,7 @@ workflow
 
				 deobfuscates
			
 
				 toolchain
			
 
				 plugins
			
 
				+<<<<<<< HEAD
			
 
				 virtualization
			
 
				 Program/!
			
 
				 retargeting