Merge pull request spf13#545 from julianduque/3.0

Fix no_conceal on youcompleteme

Author: spf13

.vimrc

@@ -600,8 +600,10 @@
             endif
 
             " For snippet_complete marker.
-            if has('conceal')
-                set conceallevel=2 concealcursor=i
+            if !exists("g:spf13_no_conceal")
+                if has('conceal')
+                    set conceallevel=2 concealcursor=i
+                endif
             endif
 
             " Disable the neosnippet preview candidate window