Merge pull request #1681 from zfi/1.2

zfi · web-flow · commit 6d654273f247 · 2019-06-05T16:21:33.000-07:00
Fixing a conflagration
diff --git a/src/main/java/com/parallax/server/blocklyprop/rest/RestCompile.java b/src/main/java/com/parallax/server/blocklyprop/rest/RestCompile.java
@@ -66,6 +66,7 @@ public Response get(@QueryParam("test") String testString) {
         return Response.ok("Hello " + testString).build();
     }
 
+/*
     @GET
     @Detail("Get Simple Libraries version")
     @Name("version")
@@ -74,7 +75,7 @@ public Response version() {
         LOG.info("REST:/rest/compile/ Get request received");
         return Response.ok("v0.0.0").build();
     }
-
+*/
 
 
     @POST

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ public Response get(@QueryParam("test") String testString) {`
`66`	`66`	`return Response.ok("Hello " + testString).build();`
`67`	`67`	`}`
`68`	`68`
	`69`	`+/*`
`69`	`70`	`@GET`
`70`	`71`	`@Detail("Get Simple Libraries version")`
`71`	`72`	`@Name("version")`
`@@ -74,7 +75,7 @@ public Response version() {`
`74`	`75`	`LOG.info("REST:/rest/compile/ Get request received");`
`75`	`76`	`return Response.ok("v0.0.0").build();`
`76`	`77`	`}`
`77`		`-`
	`78`	`+*/`
`78`	`79`
`79`	`80`
`80`	`81`	`@POST`