mtan93/homebridge
1
0
Fork 0
mirror of https://github.com/mtan93/homebridge.git synced 2026-05-26 22:07:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolve package.json conflict

Browse Source 
Merged WEMO update
This commit is contained in:
Snowdd1
2015-09-06 09:39:51 +02:00
parent dd0aa6e2c8
commit 86d548b8d9
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
-4
View File
@@ -15,12 +15,8 @@
"carwingsjs": "0.0.x", "carwingsjs": "0.0.x",
"color": "0.10.x", "color": "0.10.x",
"elkington": "kevinohara80/elkington", "elkington": "kevinohara80/elkington",
<<<<<<< HEAD
"eibd": "0.3.1", "eibd": "0.3.1",
"hap-nodejs": "git+https://github.com/KhaosT/HAP-NodeJS#fff863d7a387636fc612cf27cb859e82d9ee3294",
=======
"hap-nodejs": "git+https://github.com/KhaosT/HAP-NodeJS#6bf0f9eaaa2d87db8d1768114c61f4acbb095c41", "hap-nodejs": "git+https://github.com/KhaosT/HAP-NodeJS#6bf0f9eaaa2d87db8d1768114c61f4acbb095c41",
>>>>>>> nfarina/master
"harmonyhubjs-client": "^1.1.4", "harmonyhubjs-client": "^1.1.4",
"harmonyhubjs-discover": "git+https://github.com/swissmanu/harmonyhubjs-discover.git", "harmonyhubjs-discover": "git+https://github.com/swissmanu/harmonyhubjs-discover.git",
"mdns": "^2.2.4", "mdns": "^2.2.4",