Github user nikhilkh commented on the pull request:

    
https://github.com/apache/cordova-plugin-file-transfer/pull/145#issuecomment-217924472
  
    Sounds like there is a conflict with master - @Mikejo5001 Could you please 
rebase? Your diff should only contain the line you added.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org
For additional commands, e-mail: dev-h...@cordova.apache.org

Reply via email to