chris/lumina
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixing .dir-locals.el

Browse source
This commit is contained in:
Chris Cochrun 2022-12-08 15:22:07 -06:00
parent 8a7d6da991
commit 7a1f98aeb4
1 changed files with 0 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
.dir-locals.el
View file

@ -1,18 +1,6 @@
;;; Directory Local Variables
;;; For more information see (info "(emacs) Directory Variables")
<<<<<<< HEAD
((nil . ((projectile-project-compilation-cmd . "cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DCMAKE_BUILD_TYPE=Debug -B bld/ . && make -j8 --dir bld/ && rm -rf ~/.cache/librepresenter/Libre\ Presenter/qmlcache/")
(compile-command . "cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DCMAKE_BUILD_TYPE=Debug -B bld/ . && make -j8 --dir bld/ && rm -rf ~/.cache/librepresenter/Libre\ Presenter/qmlcache/")
=======
<<<<<<< HEAD
((nil . ((projectile-project-compilation-cmd . "cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -B build/ . && make -j8 --dir bld/ && rm -rf ~/.cache/librepresenter/Libre\ Presenter/qmlcache/")
(compile-command . "cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -B build/ . && make -j8 --dir bld/ && rm -rf ~/.cache/librepresenter/Libre\ Presenter/qmlcache/")
>>>>>>> c978cf0 (updating)
(projectile-project-run-cmd . "./bld/bin/presenter")))
=======
((nil . ((projectile-project-compilation-cmd . "cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -B build/ . && make -j8 --dir build/ && rm -rf ~/.cache/librepresenter/Libre\ Presenter/qmlcache/")
(compile-command . "cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -B build/ . && make -j8 --dir build/ && rm -rf ~/.cache/librepresenter/Libre\ Presenter/qmlcache/")
(projectile-project-run-cmd . "./build/bin/presenter")))
>>>>>>> fb671cc (updating)
(c++-mode . ((aggressive-indent-mode . nil))))