Merge pull request #21 from cchandurkar/develop

Release v1.1.11
cchandurkar · Feb 25, 2021 · d07629f · d07629f
2 parents 6520b96 + b2cbf51
commit d07629f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -1,10 +1,6 @@
 # json-schema-to-case-class
 A library to convert complex JSON Schema to [Scala Case Classes](https://docs.scala-lang.org/tour/case-classes.html). Supports both NodeJs and Browser environments. 
-<<<<<<< HEAD
 <br />[**Try Online Editor**](https://cchandurkar.github.io/json-schema-to-case-class/?q=2).
-=======
-<br />[**Try Online Editor**](https://cchandurkar.github.io/case-class-generator/).
->>>>>>> b3c077320d92b536e9463fdbbf7c6c3666f5ba97
 
  ![Build Status](https://github.com/cchandurkar/json-schema-to-case-class/actions/workflows/build-and-deploy.yml/badge.svg?branch=main)
 [![npm version](https://badge.fury.io/js/json-schema-to-case-class.svg)](https://badge.fury.io/js/json-schema-to-case-class)

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "json-schema-to-case-class",
-  "version": "1.1.10",
+  "version": "1.1.11",
   "description": "A library that converts JSON Schema to Scala Case Classes",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",