1.4.7 - fixing collision with a pre-existing PR

Todd Harris · Todd Harris · commit 6d5848c972c1 · 2022-06-12T22:33:15.000Z
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,6 +2,9 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.4.7] - 2022-06-12
+- fixing collision with prior pr
+
 ## [1.4.6] - 2022-06-12
 - initial release for WS285
 
diff --git a/Dockerrun.aws.json b/Dockerrun.aws.json
@@ -1,7 +1,7 @@
 {
   "AWSEBDockerrunVersion": 1,
   "Image": {
-    "Name": "357210185381.dkr.ecr.us-east-1.amazonaws.com/wormbase/rest:1.4.6",
+    "Name": "357210185381.dkr.ecr.us-east-1.amazonaws.com/wormbase/rest:1.4.7",
     "Update": "true"
   },
   "Ports": [
diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject wormbase/rest-api "1.4.6"
+(defproject wormbase/rest-api "1.4.7"
   :description
   "REST API for retrieving data from datomic on a per widget basis"
   :url "https://github.com/WormBase/wormbase-rest"

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"AWSEBDockerrunVersion": 1,`
`3`	`3`	`"Image": {`
`4`		`- "Name": "357210185381.dkr.ecr.us-east-1.amazonaws.com/wormbase/rest:1.4.6",`
	`4`	`+ "Name": "357210185381.dkr.ecr.us-east-1.amazonaws.com/wormbase/rest:1.4.7",`
`5`	`5`	`"Update": "true"`
`6`	`6`	`},`
`7`	`7`	`"Ports": [`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-(defproject wormbase/rest-api "1.4.6"`
	`1`	`+(defproject wormbase/rest-api "1.4.7"`
`2`	`2`	`:description`
`3`	`3`	`"REST API for retrieving data from datomic on a per widget basis"`
`4`	`4`	`:url "https://github.com/WormBase/wormbase-rest"`