[ https://issues.apache.org/jira/browse/CB-3208?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13881434#comment-13881434 ]
Herm Wong commented on CB-3208: ------------------------------- There seems to be a conflict in the ContactsProxy.js file when attempting the merge. Should I keep the version currently in the Apache repo or the one in your repo? > contacts > -------- > > Key: CB-3208 > URL: https://issues.apache.org/jira/browse/CB-3208 > Project: Apache Cordova > Issue Type: Sub-task > Components: FirefoxOS > Affects Versions: 2.6.0 > Reporter: Herm Wong > Assignee: Herm Wong > Fix For: 3.4.0 > > > Contacts API spec: https://wiki.mozilla.org/WebAPI/ContactsAPI -- This message was sent by Atlassian JIRA (v6.1.5#6160)