From 61d1f48db3f58cc9be0262e6e2a9fcd3b5e9041e Mon Sep 17 00:00:00 2001 From: dpgraham Date: Mon, 26 Jun 2017 15:25:49 -0700 Subject: [PATCH] Update CHANGELOG --- CHANGELOG.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d5c4cfbe..c740df701 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,7 @@ -<<<<<<< HEAD -## [1.1.0-beta.3](https://github.com/appium/appium-desktop/compare/v1.1.0-beta.3...v1.1.0-beta.2) (2017-06-26) -======= ## [1.1.0-beta.3](https://github.com/appium/appium-desktop/compare/v1.1.0-beta.2...v1.1.0-beta.1) (2017-06-26) ->>>>>>> Prepare for 1.1.0-beta.3 ### Changes +* Fix: Resize inspector if it was previously too small (#225) * Feature: Can record actions in Java, JS, Python, and Ruby (#224) ## [1.1.0-beta.2](https://github.com/appium/appium-desktop/compare/v1.1.0-beta.2...v1.1.0-beta.1) (2017-05-12)