Permalink
Browse files

fix project.clj

  • Loading branch information...
1 parent 0427331 commit 67ffcf1d3b46e7fea34e5554ae5f7af8d26de98b @ztellman committed May 30, 2010
Showing with 0 additions and 4 deletions.
  1. +0 −4 project.clj
View
@@ -1,11 +1,7 @@
(defproject penumbra "0.6.0-SNAPSHOT"
:description "An idiomatic wrapper for OpenGL"
:dependencies [[slick-util "1.0.0"]
-<<<<<<< HEAD:project.clj
[cantor "0.2.0-SNAPSHOT"]
-=======
- [cantor "0.1.0"]
->>>>>>> a5045ad609301cde724c2ca32b1596e1af5bff48:project.clj
[org.clojure/clojure "1.2.0-master-SNAPSHOT"]
[org.clojure/clojure-contrib "1.2.0-SNAPSHOT"]]
:native-dependencies [[penumbra/lwjgl "2.4.2"]]

0 comments on commit 67ffcf1

Please sign in to comment.