resolve README.md error

jamgold · Jan 6, 2015 · dc627e8 · dc627e8
1 parent 850ba83
commit dc627e8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git 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
@@ -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'
 });