{"action":"created","issue":{"url":"https://api.github.com/repos/openfoodfoundation/openfoodnetwork/issues/799","repository_url":"https://api.github.com/repos/openfoodfoundation/openfoodnetwork","labels_url":"https://api.github.com/repos/openfoodfoundation/openfoodnetwork/issues/799/labels{/name}","comments_url":"https://api.github.com/repos/openfoodfoundation/openfoodnetwork/issues/799/comments","events_url":"https://api.github.com/repos/openfoodfoundation/openfoodnetwork/issues/799/events","html_url":"https://github.com/openfoodfoundation/openfoodnetwork/pull/799","id":130121583,"number":799,"title":"Merge from i18n from berlin hackathon","user":{"login":"blancnic","id":16450598,"avatar_url":"https://avatars.githubusercontent.com/u/16450598?v=3","gravatar_id":"","url":"https://api.github.com/users/blancnic","html_url":"https://github.com/blancnic","followers_url":"https://api.github.com/users/blancnic/followers","following_url":"https://api.github.com/users/blancnic/following{/other_user}","gists_url":"https://api.github.com/users/blancnic/gists{/gist_id}","starred_url":"https://api.github.com/users/blancnic/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/blancnic/subscriptions","organizations_url":"https://api.github.com/users/blancnic/orgs","repos_url":"https://api.github.com/users/blancnic/repos","events_url":"https://api.github.com/users/blancnic/events{/privacy}","received_events_url":"https://api.github.com/users/blancnic/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":9,"created_at":"2016-01-31T12:20:44Z","updated_at":"2016-02-17T16:15:51Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/openfoodfoundation/openfoodnetwork/pulls/799","html_url":"https://github.com/openfoodfoundation/openfoodnetwork/pull/799","diff_url":"https://github.com/openfoodfoundation/openfoodnetwork/pull/799.diff","patch_url":"https://github.com/openfoodfoundation/openfoodnetwork/pull/799.patch"},"body":"As indicated in #753, I merged files to resolve conflicts:\r\nCONFLICT (content): Merge conflict in app/views/spree/admin/products/bulk_edit/_filters.html.haml\r\nCONFLICT (content): Merge conflict in app/views/spree/admin/orders/bulk_management.html.haml\r\nCONFLICT (content): Merge conflict in app/views/admin/variant_overrides/_products.html.haml\r\nCONFLICT (modify/delete): app/views/admin/variant_overrides/_hub_choice.html.haml deleted in upstream/master and modified in HEAD. Version HEAD of app/views/admin/variant_overrides/_hub_choice.html.haml left in tree.\r\nCONFLICT (modify/delete): app/views/admin/variant_overrides/_actions.html.haml deleted in upstream/master and modified in HEAD. Version HEAD of app/views/admin/variant_overrides/_actions.html.haml left in tree.\r\nCONFLICT (content): Merge conflict in app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee\r\nCONFLICT (modify/delete): app/assets/javascripts/admin/controllers/variant_overrides_controller.js.coffee deleted in upstream/master and modified in HEAD. Version HEAD of app/assets/javascripts/admin/controllers/variant_overrides_controller.js.coffee left in tree."},"comment":{"url":"https://api.github.com/repos/openfoodfoundation/openfoodnetwork/issues/comments/185278777","html_url":"https://github.com/openfoodfoundation/openfoodnetwork/pull/799#issuecomment-185278777","issue_url":"https://api.github.com/repos/openfoodfoundation/openfoodnetwork/issues/799","id":185278777,"user":{"login":"blancnic","id":16450598,"avatar_url":"https://avatars.githubusercontent.com/u/16450598?v=3","gravatar_id":"","url":"https://api.github.com/users/blancnic","html_url":"https://github.com/blancnic","followers_url":"https://api.github.com/users/blancnic/followers","following_url":"https://api.github.com/users/blancnic/following{/other_user}","gists_url":"https://api.github.com/users/blancnic/gists{/gist_id}","starred_url":"https://api.github.com/users/blancnic/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/blancnic/subscriptions","organizations_url":"https://api.github.com/users/blancnic/orgs","repos_url":"https://api.github.com/users/blancnic/repos","events_url":"https://api.github.com/users/blancnic/events{/privacy}","received_events_url":"https://api.github.com/users/blancnic/received_events","type":"User","site_admin":false},"created_at":"2016-02-17T16:15:51Z","updated_at":"2016-02-17T16:15:51Z","body":"Tests always failed. @mkllnk Do you have an idea? thanks"}}