twc/ludus
4
0
Fork 0
Code Issues 32 Pull Requests Packages Projects 8 Releases Wiki Activity

unfuck merge

Browse Source
This commit is contained in:
Scott Richmond 2023-05-02 19:06:37 -04:00
parent 4936daa8dc
commit d605cbd42a
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
project.clj
View File

@ -4,12 +4,6 @@
:license {:name "EPL-2.0 OR GPL-2.0-or-later WITH Classpath-exception-2.0" :license {:name "EPL-2.0 OR GPL-2.0-or-later WITH Classpath-exception-2.0"
:url "https://www.eclipse.org/legal/epl-2.0/"} :url "https://www.eclipse.org/legal/epl-2.0/"}
:dependencies [[org.clojure/clojure "1.11.1"] :dependencies [[org.clojure/clojure "1.11.1"]
<<<<<<< HEAD
[babashka/fs "0.1.6"]
[quil "4.0.0-SNAPSHOT"]]
||||||| 1c2ab51
[babashka/fs "0.1.6"]]
=======
[babashka/fs "0.1.6"] [babashka/fs "0.1.6"]
[quil "4.0.0-SNAPSHOT-1"]] [quil "4.0.0-SNAPSHOT-1"]]
>>>>>>> 55d76f6854bf67119873d98e2c9c18d8390ab90a >>>>>>> 55d76f6854bf67119873d98e2c9c18d8390ab90a