From dc627e813e9d25a369b60afb48736758969afc3b Mon Sep 17 00:00:00 2001
From: Jan Hendrik Mangold <jhm@cotren.net>
Date: Tue, 6 Jan 2015 12:30:17 -0800
Subject: [PATCH] resolve README.md error

---
 README.md  | 4 ----
 package.js | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/README.md b/README.md
index d189f29..d87aa6d 100644
--- a/README.md
+++ b/README.md
@@ -42,11 +42,7 @@ The package exports the Object Bootstrap3boilerplate that allows to configure th
 simple configure Iron Router to use Bootstrap3Boilerplate as the layoutTemplate
 
 <code>
-<<<<<<< HEAD
 Router.configure({
-=======
-Router.config({
->>>>>>> FETCH_HEAD
     layoutTemplate: 'Bootstrap3boilerplate'
 });
 </code>
diff --git a/package.js b/package.js
index b44edc0..fc9a737 100644
--- a/package.js
+++ b/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: 'jamgold:bootstrap3boilerplate',
   summary: 'Provide basic bootstrap-3 template with alert & modal & navbar & footer',
-  version: '0.0.3',
+  version: '0.0.3_1',
   git: 'https://github.com/jamgold/jamgold-bootstrap3boilerplate'
 });