{"action":"created","comment":{"url":"https://api.github.com/repos/makersacademy/takeaway-challenge/pulls/comments/60847725","id":60847725,"diff_hunk":"@@ -0,0 +1,23 @@\n+class Takeaway\n+\n+\tdef initialize(menu:Menu.new, order:Order.new)\n+\t\t@menu = menu\n+\t\t@order = order\n+\tend\n+\tdef display_menu\n+\t\tmenu.display\n+\tend\n+<<<<<<< HEAD\n+\tdef order_dishes(number_dishes)\n+\t\torder.log(number_dishes) \n+=======\n+\tdef order_dishes(number_dishes)#number_dishes = {jajangmyun: 1, bibimbap: 2}\n+\t\torder.log(number_dishes) #this way order class will calculate the prices\n+>>>>>>> e0a906505dc8788842b91dffc12af2fdc6daa78b\n+\t\torder.total\n+\tend\n+\n+\tprivate\n+\n+\tattr_reader :menu, :order \n+end","path":"lib/takeaway.rb","position":23,"original_position":23,"commit_id":"93f3832d97adbd1df8fc91b9dc6bbc00a9593b87","original_commit_id":"93f3832d97adbd1df8fc91b9dc6bbc00a9593b87","user":{"login":"houndci-bot","id":6697940,"avatar_url":"https://avatars.githubusercontent.com/u/6697940?v=3","gravatar_id":"","url":"https://api.github.com/users/houndci-bot","html_url":"https://github.com/houndci-bot","followers_url":"https://api.github.com/users/houndci-bot/followers","following_url":"https://api.github.com/users/houndci-bot/following{/other_user}","gists_url":"https://api.github.com/users/houndci-bot/gists{/gist_id}","starred_url":"https://api.github.com/users/houndci-bot/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/houndci-bot/subscriptions","organizations_url":"https://api.github.com/users/houndci-bot/orgs","repos_url":"https://api.github.com/users/houndci-bot/repos","events_url":"https://api.github.com/users/houndci-bot/events{/privacy}","received_events_url":"https://api.github.com/users/houndci-bot/received_events","type":"User","site_admin":false},"body":"unexpected token $end\n(Using Ruby 2.3 parser; configure using `TargetRubyVersion` parameter, under `AllCops`)","created_at":"2016-04-24T16:56:13Z","updated_at":"2016-04-24T16:56:13Z","html_url":"https://github.com/makersacademy/takeaway-challenge/pull/361#discussion_r60847725","pull_request_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/pulls/361","_links":{"self":{"href":"https://api.github.com/repos/makersacademy/takeaway-challenge/pulls/comments/60847725"},"html":{"href":"https://github.com/makersacademy/takeaway-challenge/pull/361#discussion_r60847725"},"pull_request":{"href":"https://api.github.com/repos/makersacademy/takeaway-challenge/pulls/361"}}},"pull_request":{"url":"https://api.github.com/repos/makersacademy/takeaway-challenge/pulls/361","id":67642593,"html_url":"https://github.com/makersacademy/takeaway-challenge/pull/361","diff_url":"https://github.com/makersacademy/takeaway-challenge/pull/361.diff","patch_url":"https://github.com/makersacademy/takeaway-challenge/pull/361.patch","issue_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/issues/361","number":361,"state":"open","locked":false,"title":"twilio","user":{"login":"naridas","id":17139862,"avatar_url":"https://avatars.githubusercontent.com/u/17139862?v=3","gravatar_id":"","url":"https://api.github.com/users/naridas","html_url":"https://github.com/naridas","followers_url":"https://api.github.com/users/naridas/followers","following_url":"https://api.github.com/users/naridas/following{/other_user}","gists_url":"https://api.github.com/users/naridas/gists{/gist_id}","starred_url":"https://api.github.com/users/naridas/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/naridas/subscriptions","organizations_url":"https://api.github.com/users/naridas/orgs","repos_url":"https://api.github.com/users/naridas/repos","events_url":"https://api.github.com/users/naridas/events{/privacy}","received_events_url":"https://api.github.com/users/naridas/received_events","type":"User","site_admin":false},"body":"forgot to do this, was wondering why i had no hound ","created_at":"2016-04-24T16:45:32Z","updated_at":"2016-04-24T16:56:13Z","closed_at":null,"merged_at":null,"merge_commit_sha":"318705610589955602a1308c1f6c78a14db09f8b","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/pulls/361/commits","review_comments_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/pulls/361/comments","review_comment_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/pulls/comments{/number}","comments_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/issues/361/comments","statuses_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/statuses/93f3832d97adbd1df8fc91b9dc6bbc00a9593b87","head":{"label":"naridas:master","ref":"master","sha":"93f3832d97adbd1df8fc91b9dc6bbc00a9593b87","user":{"login":"naridas","id":17139862,"avatar_url":"https://avatars.githubusercontent.com/u/17139862?v=3","gravatar_id":"","url":"https://api.github.com/users/naridas","html_url":"https://github.com/naridas","followers_url":"https://api.github.com/users/naridas/followers","following_url":"https://api.github.com/users/naridas/following{/other_user}","gists_url":"https://api.github.com/users/naridas/gists{/gist_id}","starred_url":"https://api.github.com/users/naridas/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/naridas/subscriptions","organizations_url":"https://api.github.com/users/naridas/orgs","repos_url":"https://api.github.com/users/naridas/repos","events_url":"https://api.github.com/users/naridas/events{/privacy}","received_events_url":"https://api.github.com/users/naridas/received_events","type":"User","site_admin":false},"repo":{"id":56862824,"name":"takeaway-challenge","full_name":"naridas/takeaway-challenge","owner":{"login":"naridas","id":17139862,"avatar_url":"https://avatars.githubusercontent.com/u/17139862?v=3","gravatar_id":"","url":"https://api.github.com/users/naridas","html_url":"https://github.com/naridas","followers_url":"https://api.github.com/users/naridas/followers","following_url":"https://api.github.com/users/naridas/following{/other_user}","gists_url":"https://api.github.com/users/naridas/gists{/gist_id}","starred_url":"https://api.github.com/users/naridas/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/naridas/subscriptions","organizations_url":"https://api.github.com/users/naridas/orgs","repos_url":"https://api.github.com/users/naridas/repos","events_url":"https://api.github.com/users/naridas/events{/privacy}","received_events_url":"https://api.github.com/users/naridas/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/naridas/takeaway-challenge","description":"Use the Twilio Gem to order food","fork":true,"url":"https://api.github.com/repos/naridas/takeaway-challenge","forks_url":"https://api.github.com/repos/naridas/takeaway-challenge/forks","keys_url":"https://api.github.com/repos/naridas/takeaway-challenge/keys{/key_id}","collaborators_url":"https://api.github.com/repos/naridas/takeaway-challenge/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/naridas/takeaway-challenge/teams","hooks_url":"https://api.github.com/repos/naridas/takeaway-challenge/hooks","issue_events_url":"https://api.github.com/repos/naridas/takeaway-challenge/issues/events{/number}","events_url":"https://api.github.com/repos/naridas/takeaway-challenge/events","assignees_url":"https://api.github.com/repos/naridas/takeaway-challenge/assignees{/user}","branches_url":"https://api.github.com/repos/naridas/takeaway-challenge/branches{/branch}","tags_url":"https://api.github.com/repos/naridas/takeaway-challenge/tags","blobs_url":"https://api.github.com/repos/naridas/takeaway-challenge/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/naridas/takeaway-challenge/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/naridas/takeaway-challenge/git/refs{/sha}","trees_url":"https://api.github.com/repos/naridas/takeaway-challenge/git/trees{/sha}","statuses_url":"https://api.github.com/repos/naridas/takeaway-challenge/statuses/{sha}","languages_url":"https://api.github.com/repos/naridas/takeaway-challenge/languages","stargazers_url":"https://api.github.com/repos/naridas/takeaway-challenge/stargazers","contributors_url":"https://api.github.com/repos/naridas/takeaway-challenge/contributors","subscribers_url":"https://api.github.com/repos/naridas/takeaway-challenge/subscribers","subscription_url":"https://api.github.com/repos/naridas/takeaway-challenge/subscription","commits_url":"https://api.github.com/repos/naridas/takeaway-challenge/commits{/sha}","git_commits_url":"https://api.github.com/repos/naridas/takeaway-challenge/git/commits{/sha}","comments_url":"https://api.github.com/repos/naridas/takeaway-challenge/comments{/number}","issue_comment_url":"https://api.github.com/repos/naridas/takeaway-challenge/issues/comments{/number}","contents_url":"https://api.github.com/repos/naridas/takeaway-challenge/contents/{+path}","compare_url":"https://api.github.com/repos/naridas/takeaway-challenge/compare/{base}...{head}","merges_url":"https://api.github.com/repos/naridas/takeaway-challenge/merges","archive_url":"https://api.github.com/repos/naridas/takeaway-challenge/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/naridas/takeaway-challenge/downloads","issues_url":"https://api.github.com/repos/naridas/takeaway-challenge/issues{/number}","pulls_url":"https://api.github.com/repos/naridas/takeaway-challenge/pulls{/number}","milestones_url":"https://api.github.com/repos/naridas/takeaway-challenge/milestones{/number}","notifications_url":"https://api.github.com/repos/naridas/takeaway-challenge/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/naridas/takeaway-challenge/labels{/name}","releases_url":"https://api.github.com/repos/naridas/takeaway-challenge/releases{/id}","deployments_url":"https://api.github.com/repos/naridas/takeaway-challenge/deployments","created_at":"2016-04-22T14:49:18Z","updated_at":"2016-04-22T14:49:19Z","pushed_at":"2016-04-24T16:56:06Z","git_url":"git://github.com/naridas/takeaway-challenge.git","ssh_url":"git@github.com:naridas/takeaway-challenge.git","clone_url":"https://github.com/naridas/takeaway-challenge.git","svn_url":"https://github.com/naridas/takeaway-challenge","homepage":null,"size":68,"stargazers_count":0,"watchers_count":0,"language":"Ruby","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"makersacademy:master","ref":"master","sha":"6e6e8a8b5b75cde5de06b1b310037c74ea24b68e","user":{"login":"makersacademy","id":3636186,"avatar_url":"https://avatars.githubusercontent.com/u/3636186?v=3","gravatar_id":"","url":"https://api.github.com/users/makersacademy","html_url":"https://github.com/makersacademy","followers_url":"https://api.github.com/users/makersacademy/followers","following_url":"https://api.github.com/users/makersacademy/following{/other_user}","gists_url":"https://api.github.com/users/makersacademy/gists{/gist_id}","starred_url":"https://api.github.com/users/makersacademy/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/makersacademy/subscriptions","organizations_url":"https://api.github.com/users/makersacademy/orgs","repos_url":"https://api.github.com/users/makersacademy/repos","events_url":"https://api.github.com/users/makersacademy/events{/privacy}","received_events_url":"https://api.github.com/users/makersacademy/received_events","type":"Organization","site_admin":false},"repo":{"id":27006189,"name":"takeaway-challenge","full_name":"makersacademy/takeaway-challenge","owner":{"login":"makersacademy","id":3636186,"avatar_url":"https://avatars.githubusercontent.com/u/3636186?v=3","gravatar_id":"","url":"https://api.github.com/users/makersacademy","html_url":"https://github.com/makersacademy","followers_url":"https://api.github.com/users/makersacademy/followers","following_url":"https://api.github.com/users/makersacademy/following{/other_user}","gists_url":"https://api.github.com/users/makersacademy/gists{/gist_id}","starred_url":"https://api.github.com/users/makersacademy/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/makersacademy/subscriptions","organizations_url":"https://api.github.com/users/makersacademy/orgs","repos_url":"https://api.github.com/users/makersacademy/repos","events_url":"https://api.github.com/users/makersacademy/events{/privacy}","received_events_url":"https://api.github.com/users/makersacademy/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/makersacademy/takeaway-challenge","description":"Use the Twilio Gem to order food","fork":false,"url":"https://api.github.com/repos/makersacademy/takeaway-challenge","forks_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/forks","keys_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/keys{/key_id}","collaborators_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/teams","hooks_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/hooks","issue_events_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/issues/events{/number}","events_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/events","assignees_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/assignees{/user}","branches_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/branches{/branch}","tags_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/tags","blobs_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/git/refs{/sha}","trees_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/git/trees{/sha}","statuses_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/statuses/{sha}","languages_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/languages","stargazers_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/stargazers","contributors_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/contributors","subscribers_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/subscribers","subscription_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/subscription","commits_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/commits{/sha}","git_commits_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/git/commits{/sha}","comments_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/comments{/number}","issue_comment_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/issues/comments{/number}","contents_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/contents/{+path}","compare_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/compare/{base}...{head}","merges_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/merges","archive_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/downloads","issues_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/issues{/number}","pulls_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/pulls{/number}","milestones_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/milestones{/number}","notifications_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/labels{/name}","releases_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/releases{/id}","deployments_url":"https://api.github.com/repos/makersacademy/takeaway-challenge/deployments","created_at":"2014-11-22T17:19:46Z","updated_at":"2016-04-23T21:29:36Z","pushed_at":"2016-04-24T16:56:06Z","git_url":"git://github.com/makersacademy/takeaway-challenge.git","ssh_url":"git@github.com:makersacademy/takeaway-challenge.git","clone_url":"https://github.com/makersacademy/takeaway-challenge.git","svn_url":"https://github.com/makersacademy/takeaway-challenge","homepage":null,"size":4203,"stargazers_count":1,"watchers_count":1,"language":"Ruby","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":329,"mirror_url":null,"open_issues_count":28,"forks":329,"open_issues":28,"watchers":1,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/makersacademy/takeaway-challenge/pulls/361"},"html":{"href":"https://github.com/makersacademy/takeaway-challenge/pull/361"},"issue":{"href":"https://api.github.com/repos/makersacademy/takeaway-challenge/issues/361"},"comments":{"href":"https://api.github.com/repos/makersacademy/takeaway-challenge/issues/361/comments"},"review_comments":{"href":"https://api.github.com/repos/makersacademy/takeaway-challenge/pulls/361/comments"},"review_comment":{"href":"https://api.github.com/repos/makersacademy/takeaway-challenge/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/makersacademy/takeaway-challenge/pulls/361/commits"},"statuses":{"href":"https://api.github.com/repos/makersacademy/takeaway-challenge/statuses/93f3832d97adbd1df8fc91b9dc6bbc00a9593b87"}}}}