keep unfucking merge

This commit is contained in:
Scott Richmond 2023-05-02 19:08:18 -04:00
parent 96b3f01e7e
commit 197f4772ba

View File

@ -6,7 +6,6 @@
:dependencies [[org.clojure/clojure "1.11.1"] :dependencies [[org.clojure/clojure "1.11.1"]
[babashka/fs "0.1.6"] [babashka/fs "0.1.6"]
[quil "4.0.0-SNAPSHOT-1"]] [quil "4.0.0-SNAPSHOT-1"]]
>>>>>>> 55d76f6854bf67119873d98e2c9c18d8390ab90a
:plugins [[lein-cljfmt "0.8.0"]] :plugins [[lein-cljfmt "0.8.0"]]
:repl-options {:init-ns ludus.core} :repl-options {:init-ns ludus.core}
:main ludus.core :main ludus.core