From 7847e87a8bd08f6f9487df1d8cff528933712ea0 Mon Sep 17 00:00:00 2001
From: Sebastian Hildebrandt <hildebrandt@plus-innovations.com>
Date: Thu, 7 Jan 2016 11:37:52 +0100
Subject: [PATCH] Version 2.0.0

---
 .gitignore | 1 +
 .npmignore | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index c3c7137..c98a0cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,6 +46,7 @@ npm*
 *.gz
 
 # Other
+*_conflict-
 .notes.txt
 .idea
 *.ipr
diff --git a/.npmignore b/.npmignore
index 66f95b1..c4362ce 100644
--- a/.npmignore
+++ b/.npmignore
@@ -10,3 +10,4 @@ CVS
 npm-debug.log
 *.sublime-project
 *.sublime-workspace
+*_conflict-