robmurtha
diff --git a/‎.gitignore‎
Lines changed: 2 additions & 8 deletions b/‎.gitignore‎
Lines changed: 2 additions & 8 deletions
diff --git a/‎Gruntfile.js‎
Lines changed: 1 addition & 1 deletion b/‎Gruntfile.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎bower.json‎
Lines changed: 2 additions & 2 deletions b/‎bower.json‎
Lines changed: 2 additions & 2 deletions
@@ -1,13 +1,7 @@
 *.DS_Store
 *.log
-<<<<<<< HEAD
+npm-debug.log
 tmp/
 node_modules/
 components/
-=======
-tmp
-node_modules
-components
-bower_components
->>>>>>> 543f720e38e2315dcb77297320ee8edff94e12aa
-npm-debug.log
+bower_components/
@@ -136,4 +136,4 @@ module.exports = function(grunt) {
     "jasmine_node"
   ]);
 
-};
+};
@@ -1,6 +1,6 @@
 {
   "name": "bluebutton",
-  "version": "0.0.17",
+  "version": "0.0.18",
   "description": "BlueButton.js allows web developers to parse and navigate complex health data with ease.",
   "main": [
     "build/bluebutton.js"
@@ -15,4 +15,4 @@
   "devDependencies": {
     "sample_ccdas": "[email protected]:chb/sample_ccdas.git"
   }
-}
+}
-Original file line number
+Diff line change
     "jasmine_node"
   ]);
 -};
 +};
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "bluebutton",`
`3`		`- "version": "0.0.17",`
	`3`	`+ "version": "0.0.18",`
`4`	`4`	`"description": "BlueButton.js allows web developers to parse and navigate complex health data with ease.",`
`5`	`5`	`"main": [`
`6`	`6`	`"build/bluebutton.js"`
`@@ -15,4 +15,4 @@`
`15`	`15`	`"devDependencies": {`
`16`	`16`	`"sample_ccdas": "[email protected]:chb/sample_ccdas.git"`
`17`	`17`	`}`
`18`		`-}`
	`18`	`+}`