Cut new release.

clojusc · Jul 3, 2018 · 29bbe26 · 29bbe26
1 parent a3b8198
commit 29bbe26
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -124,11 +124,10 @@ previous reference documentation, visit the
 
 | Version             | Notes
 |---------------------|------------------------------------------------------
-| 3.5.1-v1.1-SNAPSHOT | Added docs, more func renames, new abstraction layer, improved DevEx of API
+| 3.5.1-v1.1          | Added docs, more func renames, new abstraction layer, improved DevEx of API, and fix for enums as Clojure keywords
 | 3.5.1-v1.0          | Droped extra deps, renamed functions
 | 3.5.1-v0.3          | Bumped to use the latest Google Protocol Buffer release, re-added tests, Travis CI support
 | 3.4.0-v0.2          | Transition release; identical to the ghaskins clojure-protobuf at version  3.4.0-2-SNAPSHOT
->>>>>>> 1a69e76ae91f67a6c9845528280efd92f1476d83
 
 A note on the history: This project picked up the Clojure protobuf code base
 from the [ghaskins fork](https://github.com/ghaskins/clojure-protobuf); its

diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojusc/protobuf "3.5.1-v1.1-SNAPSHOT"
+(defproject clojusc/protobuf "3.5.1-v1.1"
   :description "A Clojure interface to Google's protocol buffers"
   :url "https://github.com/clojusc/protobuf"
   :license {