1 files changed, 27 insertions, 0 deletions

diff --git a/ycm_extra_conf.py b/ycm_extra_conf.py
index 7a1828f..3c2b399 100644
--- a/ycm_extra_conf.py
+++ b/ycm_extra_conf.py
@@ -1,3 +1,4 @@
+<<<<<<< Updated upstream
 def FlagsForFile(filename, **kwargs):
     return {
         'flags': [
@@ -19,3 +20,29 @@ 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