Github user robertkowalski commented on the pull request:
https://github.com/apache/couchdb-fauxton/pull/168#issuecomment-65708193
can you rebase it as the branch contains conflicts?--- 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 [email protected] or file a JIRA ticket with INFRA. ---
