robmurtha
diff --git a/‎.gitignore‎
Lines changed: 7 additions & 0 deletions b/‎.gitignore‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎.npmignore‎
Lines changed: 3 additions & 0 deletions b/‎.npmignore‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎bower.json‎
Lines changed: 2 additions & 2 deletions b/‎bower.json‎
Lines changed: 2 additions & 2 deletions
@@ -1,6 +1,13 @@
 *.DS_Store
 *.log
+<<<<<<< HEAD
 tmp/
 node_modules/
 components/
+=======
+tmp
+node_modules
+components
+bower_components
+>>>>>>> 543f720e38e2315dcb77297320ee8edff94e12aa
 npm-debug.log
@@ -0,0 +1,3 @@
+spec
+src
+Gruntfile.js
@@ -1,6 +1,6 @@
 {
   "name": "bluebutton",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "description": "BlueButton.js allows web developers to parse and navigate complex health data with ease.",
   "main": [
     "build/bluebutton.js"
@@ -13,6 +13,6 @@
   ],
   "dependencies": {},
   "devDependencies": {
-    "blue-button-reference-ccda": "[email protected]:blue-button/blue-button-reference-ccda.git"
+    "sample_ccdas": "[email protected]:chb/sample_ccdas.git"
   }
 }
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "bluebutton",`
`3`		`- "version": "0.0.15",`
	`3`	`+ "version": "0.0.17",`
`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"`
`@@ -13,6 +13,6 @@`
`13`	`13`	`],`
`14`	`14`	`"dependencies": {},`
`15`	`15`	`"devDependencies": {`
`16`		`- "blue-button-reference-ccda": "[email protected]:blue-button/blue-button-reference-ccda.git"`
	`16`	`+ "sample_ccdas": "[email protected]:chb/sample_ccdas.git"`
`17`	`17`	`}`
`18`	`18`	`}`