From 776fde9ce07f019462e2112ee26b9ea226ff2bb4 Mon Sep 17 00:00:00 2001
From: Juha Ristolainen <juha.ristolainen@wimdu.com>
Date: Thu, 5 Jul 2018 11:24:51 +0200
Subject: [PATCH] Merge

---
 CHANGELOG.md | 7 -------
 README.md    | 3 ---
 package.json | 9 ---------
 3 files changed, 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 499344d..0f03a4d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,24 +2,17 @@
 
 All notable changes to the "code-stats-vscode" extension will be documented in this file.
 
-<<<<<<< HEAD
-=======
 ## [1.0.12] - 2018-07-05
 
 ### Changed
 
 Updated some outdated dependency packages.
 
->>>>>>> develop
 ## [1.0.11] - 2018-07-04
 
 ### Changed
 
-<<<<<<< HEAD
 Fixed the missing lodash.template dependency for the merged HTML profile view.
-=======
-Fixed the missing lodast.template dependency
->>>>>>> develop
 
 ## [1.0.10] - 2018-07-04
 
diff --git a/README.md b/README.md
index 247f158..f7fadbd 100644
--- a/README.md
+++ b/README.md
@@ -24,13 +24,10 @@ This extension contributes the following settings:
 
 ## Release Notes
 
-<<<<<<< HEAD
-=======
 ### 1.0.12
 
 Updated some outdated dependency packages.
 
->>>>>>> develop
 ### 1.0.11
 
 Fixed the missing lodash.template dependency for the merged HTML profile view.
diff --git a/package.json b/package.json
index 9b0f98a..f270cd6 100644
--- a/package.json
+++ b/package.json
@@ -2,11 +2,7 @@
   "name": "code-stats-vscode",
   "displayName": "Code::Stats",
   "description": "Code::Stats package for Visual Studio Code",
-<<<<<<< HEAD
-  "version": "1.0.11",
-=======
   "version": "1.0.12",
->>>>>>> develop
   "license": "MIT",
   "publisher": "riussi",
   "contributors": [
@@ -67,13 +63,8 @@
     "vscode": "^1.1.0",
     "mocha": "^5.2.0",
     "growl": "^1.10.5",
-<<<<<<< HEAD
-    "@types/node": "^6.0.40",
-    "@types/mocha": "^2.2.32"
-=======
     "@types/node": "^10.5.1",
     "@types/mocha": "^5.2.4"
->>>>>>> develop
   },
   "dependencies": {
     "axios": "0.18.0",