From 2c8f6cd340ee1abf0f3b8c9391a6b7f1ab6b968b Mon Sep 17 00:00:00 2001 From: Jamie Peabody Date: Mon, 6 Aug 2018 13:01:13 +0100 Subject: [PATCH] chore: updated docs --- CHANGES.md | 3 +++ README.md | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 2927ae1..f5069e5 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,8 @@ # Changes +## 4.0.7 +* chore: updated documentation + ## 4.0.6 * #89: fixes missing merge buttons diff --git a/README.md b/README.md index 2d9004a..69aafda 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,9 @@ Mergely is a javascript component to diff/merge files interactively in a browser ### Installation via webpack The recommended way to install mergely is to use npm and [webpack](https://webpack.js.org/) to install mergely and its dependencies. It is highly recommended that you start by cloning [mergely-webpack](https://github.com/wickedest/mergely-webpack). It has everything that you need to get started. +### Angular 6.1.1 +You can also use mergely within angular. You can start by cloning [mergely-angular](https://github.com/wickedest/mergely-angular). + ### Installation via .tgz Unpack mergely.tgz into a folder, e.g. `./lib`, and then add the following to the `` of your target html source file. @@ -46,9 +49,6 @@ The following example can be used to set the `lhs` and `rhs` editors synchronous ```js $(document).ready(function () { - // initialize mergely - $('#mergely').mergely(); - // set editor content $('#mergely').mergely({ lhs: function(setValue) {