Merge branch 'master' of codeberg.org:opalvaults/opalfiles

2022-07-06 21:05:18 -07:00
parent 784f365c72 47f02ddba8
commit 4f2aa94939
4 changed files with 90 additions and 74 deletions
--- a/.config/doom/init.el
+++ b/.config/doom/init.el
@@ -104,8 +104,13 @@
       ;;agda              ; types of types of types of types...
       ;;beancount         ; mind the GAAP
       ;;cc                ; C > C++ == 1
+<<<<<<< HEAD
       clojure           ; java with a lisp
       ;;common-lisp       ; if you've seen one lisp, you've seen them all
+=======
+       ;;clojure           ; java with a lisp
+       common-lisp       ; if you've seen one lisp, you've seen them all
+>>>>>>> 47f02ddba8cf239172e5aa36884fa59360472389
       ;;coq               ; proofs-as-programs
       ;;crystal           ; ruby at the speed of c
       ;;csharp            ; unity, .NET, and mono shenanigans