Fancier lightline

1 files changed, 0 insertions, 27 deletions

diff --git a/ycm_extra_conf.py b/ycm_extra_conf.py
index 3c2b399..7a1828f 100644
--- a/ycm_extra_conf.py
+++ b/ycm_extra_conf.py
@@ -1,4 +1,3 @@
-<<<<<<< Updated upstream
 def FlagsForFile(filename, **kwargs):
     return {
         'flags': [
@@ -20,29 +19,3 @@ def FlagsForFile(filename, **kwargs):
     }
 
 # vim:set et sw=4 ts=4 tw=120:
-=======
-import os
-import ycm_core
-
-def FlagsForFile( filename, **kwargs ):
-  return {
-    'flags': [
-      '-Wall',
-      '-Wextra',
-      '-Werror',
-      '-Wno-long-long',
-      '-Wno-variadic-macros',
-      '-fexceptions',
-      '-ferror-limit=10000',
-      '-DNDEBUG',
-      '-std=c99',
-      '-x', 'c',
-      '-D_GNU_SOURCE',
-      '-I.',
-      '-I', '/usr/include/'
-    ],
-    'do_cache': True,
-  }
-
-# vim:set et sw=2 ts=2 tw=120:
->>>>>>> Stashed changes