fixing a bunch of broken stuff I think

README.org

@@ -859,11 +859,21 @@ Since I like to make my window manager handle a lot of the window management, I
 #+end_src
 
 ** Languages
+<<<<<<< HEAD
 Before getting into languages, often times compilation of things use ansi-colors, so in order to make sure those characters get rendered properly, here we make sure that those colors work ok.
 #+BEGIN_SRC emacs-lisp
 (defvar read-symbol-positions-list nil)
 (add-hook 'comint-mode-hook 'ansi-color-for-comint-mode-on)
 #+END_SRC
+=======
+
+*** C++
+In c++ I just want to make sure lsp is called when enter cc-mode
+#+BEGIN_SRC emacs-lisp
+(add-hook 'c++-mode-hook 'lsp)
+#+END_SRC
+
+>>>>>>> bc54f870 (fixing a bunch of broken stuff I think)
 *** Lua
 Since I use the Awesome WM I thought it'd be good to have lua around. It's also in a lot of things.
 #+begin_src emacs-lisp
@@ -970,7 +980,13 @@ I make some apps in Qt 5 so QML is a needed language although the support in Ema
 (use-package company-qml
   :after qml-mode
   :config
-  (add-to-list 'company-backends 'company-qml))
+  ;; (add-to-list 'company-backends 'company-qml)
+  )
+
+;; (setq company-backends
+;;       '(company-bbdb company-semantic company-cmake company-capf company-clang company-files
+;;               (company-dabbrev-code company-gtags company-etags company-keywords)
+;;               company-oddmuse company-dabbrev))
 
 (use-package qt-pro-mode
   :after qml-mode)