From 29fbce4e2d09a8711606e34b4bdd1be758b5e88d Mon Sep 17 00:00:00 2001
From: Vinzent <vinzentwitte@gmail.com>
Date: Wed, 24 Mar 2021 21:38:36 +0100
Subject: [PATCH] chore(release): 1.7.0

---
 CHANGELOG.md  | 15 +++++++++++++++
 manifest.json |  2 +-
 package.json  |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75fe8a00..207c5e32 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,21 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.7.0](https://github.com/denolehov/obsidian-git/compare/1.6.1...1.7.0) (2021-03-24)
+
+
+### Features
+
+* add git initialization and conflict files status to statusbar ([ba0ef11](https://github.com/denolehov/obsidian-git/commit/ba0ef11a5abcc8ff11d9e33ca8157a283d06920b))
+* auto pull on specified interval ([2aa7fb8](https://github.com/denolehov/obsidian-git/commit/2aa7fb866e41c1f7170b723a35d9acd2942921b0)), closes [#59](https://github.com/denolehov/obsidian-git/issues/59)
+* conflict files support ([358dc6e](https://github.com/denolehov/obsidian-git/commit/358dc6e492e6ef8156687535d14a9070ebadfb30)), closes [#38](https://github.com/denolehov/obsidian-git/issues/38)
+* list changed files ([5e28b94](https://github.com/denolehov/obsidian-git/commit/5e28b9449f3f7f978fe825fb102b61fb27d191e4))
+
+
+### Bug Fixes
+
+* conflict files pane was opened on pull error ([8d43e7b](https://github.com/denolehov/obsidian-git/commit/8d43e7b32e7b5082c3518537ce32c0627b35dfb2))
+
 ### [1.6.1](https://github.com/denolehov/obsidian-git/compare/1.6.0...1.6.1) (2021-03-17)
 
 
diff --git a/manifest.json b/manifest.json
index 698b0a97..a52a6833 100644
--- a/manifest.json
+++ b/manifest.json
@@ -4,5 +4,5 @@
     "description": "Backup your vault with git.",
     "isDesktopOnly": true,
     "js": "main.js",
-    "version": "1.6.1"
+    "version": "1.7.0"
 }
diff --git a/package.json b/package.json
index 03428797..19683f02 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "obsidian-git",
-    "version": "1.6.1",
+    "version": "1.7.0",
     "description": "Backup your Obsidian (https://obsidian.md) vault with git",
     "main": "main.js",
     "scripts": {