{"action":"created","comment":{"url":"https://api.github.com/repos/chelseaworrel/sales_engine/pulls/comments/25878028","id":25878028,"diff_hunk":"@@ -1,9 +1,16 @@\n # require 'csv'\n require_relative './customer_repository'\n+<<<<<<< HEAD\n+# require_relative './invoice_repository'\n+# require_relative './invoice_item_repository'\n+# require_relative './item_repository'\n+# require_relative './merchant_repository'\n+=======\n require_relative './invoice_repository'\n require_relative './invoice_item_repository'\n require_relative './item_repository'\n require_relative './merchant_repository'\n+>>>>>>> master","path":"lib/sales_engine.rb","position":13,"original_position":13,"commit_id":"65276980684546a6012baff93b642c7cd80ad850","original_commit_id":"65276980684546a6012baff93b642c7cd80ad850","user":{"login":"houndci","id":6697940,"avatar_url":"https://avatars.githubusercontent.com/u/6697940?v=3","gravatar_id":"","url":"https://api.github.com/users/houndci","html_url":"https://github.com/houndci","followers_url":"https://api.github.com/users/houndci/followers","following_url":"https://api.github.com/users/houndci/following{/other_user}","gists_url":"https://api.github.com/users/houndci/gists{/gist_id}","starred_url":"https://api.github.com/users/houndci/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/houndci/subscriptions","organizations_url":"https://api.github.com/users/houndci/orgs","repos_url":"https://api.github.com/users/houndci/repos","events_url":"https://api.github.com/users/houndci/events{/privacy}","received_events_url":"https://api.github.com/users/houndci/received_events","type":"User","site_admin":false},"body":"unexpected token tRSHFT","created_at":"2015-03-05T16:37:30Z","updated_at":"2015-03-05T16:37:30Z","html_url":"https://github.com/chelseaworrel/sales_engine/pull/12#discussion_r25878028","pull_request_url":"https://api.github.com/repos/chelseaworrel/sales_engine/pulls/12","_links":{"self":{"href":"https://api.github.com/repos/chelseaworrel/sales_engine/pulls/comments/25878028"},"html":{"href":"https://github.com/chelseaworrel/sales_engine/pull/12#discussion_r25878028"},"pull_request":{"href":"https://api.github.com/repos/chelseaworrel/sales_engine/pulls/12"}}},"pull_request":{"url":"https://api.github.com/repos/chelseaworrel/sales_engine/pulls/12","id":30529158,"html_url":"https://github.com/chelseaworrel/sales_engine/pull/12","diff_url":"https://github.com/chelseaworrel/sales_engine/pull/12.diff","patch_url":"https://github.com/chelseaworrel/sales_engine/pull/12.patch","issue_url":"https://api.github.com/repos/chelseaworrel/sales_engine/issues/12","number":12,"state":"open","locked":false,"title":"transactions completed","user":{"login":"kristinabrown","id":6318927,"avatar_url":"https://avatars.githubusercontent.com/u/6318927?v=3","gravatar_id":"","url":"https://api.github.com/users/kristinabrown","html_url":"https://github.com/kristinabrown","followers_url":"https://api.github.com/users/kristinabrown/followers","following_url":"https://api.github.com/users/kristinabrown/following{/other_user}","gists_url":"https://api.github.com/users/kristinabrown/gists{/gist_id}","starred_url":"https://api.github.com/users/kristinabrown/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kristinabrown/subscriptions","organizations_url":"https://api.github.com/users/kristinabrown/orgs","repos_url":"https://api.github.com/users/kristinabrown/repos","events_url":"https://api.github.com/users/kristinabrown/events{/privacy}","received_events_url":"https://api.github.com/users/kristinabrown/received_events","type":"User","site_admin":false},"body":"","created_at":"2015-03-05T04:17:05Z","updated_at":"2015-03-05T16:37:30Z","closed_at":null,"merged_at":null,"merge_commit_sha":"5f620b63b0f992242d7b369bb09626d8e9d9ae2b","assignee":{"login":"kristinabrown","id":6318927,"avatar_url":"https://avatars.githubusercontent.com/u/6318927?v=3","gravatar_id":"","url":"https://api.github.com/users/kristinabrown","html_url":"https://github.com/kristinabrown","followers_url":"https://api.github.com/users/kristinabrown/followers","following_url":"https://api.github.com/users/kristinabrown/following{/other_user}","gists_url":"https://api.github.com/users/kristinabrown/gists{/gist_id}","starred_url":"https://api.github.com/users/kristinabrown/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kristinabrown/subscriptions","organizations_url":"https://api.github.com/users/kristinabrown/orgs","repos_url":"https://api.github.com/users/kristinabrown/repos","events_url":"https://api.github.com/users/kristinabrown/events{/privacy}","received_events_url":"https://api.github.com/users/kristinabrown/received_events","type":"User","site_admin":false},"milestone":null,"commits_url":"https://api.github.com/repos/chelseaworrel/sales_engine/pulls/12/commits","review_comments_url":"https://api.github.com/repos/chelseaworrel/sales_engine/pulls/12/comments","review_comment_url":"https://api.github.com/repos/chelseaworrel/sales_engine/pulls/comments{/number}","comments_url":"https://api.github.com/repos/chelseaworrel/sales_engine/issues/12/comments","statuses_url":"https://api.github.com/repos/chelseaworrel/sales_engine/statuses/65276980684546a6012baff93b642c7cd80ad850","head":{"label":"chelseaworrel:transactions","ref":"transactions","sha":"65276980684546a6012baff93b642c7cd80ad850","user":{"login":"chelseaworrel","id":9851891,"avatar_url":"https://avatars.githubusercontent.com/u/9851891?v=3","gravatar_id":"","url":"https://api.github.com/users/chelseaworrel","html_url":"https://github.com/chelseaworrel","followers_url":"https://api.github.com/users/chelseaworrel/followers","following_url":"https://api.github.com/users/chelseaworrel/following{/other_user}","gists_url":"https://api.github.com/users/chelseaworrel/gists{/gist_id}","starred_url":"https://api.github.com/users/chelseaworrel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/chelseaworrel/subscriptions","organizations_url":"https://api.github.com/users/chelseaworrel/orgs","repos_url":"https://api.github.com/users/chelseaworrel/repos","events_url":"https://api.github.com/users/chelseaworrel/events{/privacy}","received_events_url":"https://api.github.com/users/chelseaworrel/received_events","type":"User","site_admin":false},"repo":{"id":31612636,"name":"sales_engine","full_name":"chelseaworrel/sales_engine","owner":{"login":"chelseaworrel","id":9851891,"avatar_url":"https://avatars.githubusercontent.com/u/9851891?v=3","gravatar_id":"","url":"https://api.github.com/users/chelseaworrel","html_url":"https://github.com/chelseaworrel","followers_url":"https://api.github.com/users/chelseaworrel/followers","following_url":"https://api.github.com/users/chelseaworrel/following{/other_user}","gists_url":"https://api.github.com/users/chelseaworrel/gists{/gist_id}","starred_url":"https://api.github.com/users/chelseaworrel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/chelseaworrel/subscriptions","organizations_url":"https://api.github.com/users/chelseaworrel/orgs","repos_url":"https://api.github.com/users/chelseaworrel/repos","events_url":"https://api.github.com/users/chelseaworrel/events{/privacy}","received_events_url":"https://api.github.com/users/chelseaworrel/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/chelseaworrel/sales_engine","description":"sales_engine project module one (Turing)","fork":false,"url":"https://api.github.com/repos/chelseaworrel/sales_engine","forks_url":"https://api.github.com/repos/chelseaworrel/sales_engine/forks","keys_url":"https://api.github.com/repos/chelseaworrel/sales_engine/keys{/key_id}","collaborators_url":"https://api.github.com/repos/chelseaworrel/sales_engine/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/chelseaworrel/sales_engine/teams","hooks_url":"https://api.github.com/repos/chelseaworrel/sales_engine/hooks","issue_events_url":"https://api.github.com/repos/chelseaworrel/sales_engine/issues/events{/number}","events_url":"https://api.github.com/repos/chelseaworrel/sales_engine/events","assignees_url":"https://api.github.com/repos/chelseaworrel/sales_engine/assignees{/user}","branches_url":"https://api.github.com/repos/chelseaworrel/sales_engine/branches{/branch}","tags_url":"https://api.github.com/repos/chelseaworrel/sales_engine/tags","blobs_url":"https://api.github.com/repos/chelseaworrel/sales_engine/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/chelseaworrel/sales_engine/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/chelseaworrel/sales_engine/git/refs{/sha}","trees_url":"https://api.github.com/repos/chelseaworrel/sales_engine/git/trees{/sha}","statuses_url":"https://api.github.com/repos/chelseaworrel/sales_engine/statuses/{sha}","languages_url":"https://api.github.com/repos/chelseaworrel/sales_engine/languages","stargazers_url":"https://api.github.com/repos/chelseaworrel/sales_engine/stargazers","contributors_url":"https://api.github.com/repos/chelseaworrel/sales_engine/contributors","subscribers_url":"https://api.github.com/repos/chelseaworrel/sales_engine/subscribers","subscription_url":"https://api.github.com/repos/chelseaworrel/sales_engine/subscription","commits_url":"https://api.github.com/repos/chelseaworrel/sales_engine/commits{/sha}","git_commits_url":"https://api.github.com/repos/chelseaworrel/sales_engine/git/commits{/sha}","comments_url":"https://api.github.com/repos/chelseaworrel/sales_engine/comments{/number}","issue_comment_url":"https://api.github.com/repos/chelseaworrel/sales_engine/issues/comments{/number}","contents_url":"https://api.github.com/repos/chelseaworrel/sales_engine/contents/{+path}","compare_url":"https://api.github.com/repos/chelseaworrel/sales_engine/compare/{base}...{head}","merges_url":"https://api.github.com/repos/chelseaworrel/sales_engine/merges","archive_url":"https://api.github.com/repos/chelseaworrel/sales_engine/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/chelseaworrel/sales_engine/downloads","issues_url":"https://api.github.com/repos/chelseaworrel/sales_engine/issues{/number}","pulls_url":"https://api.github.com/repos/chelseaworrel/sales_engine/pulls{/number}","milestones_url":"https://api.github.com/repos/chelseaworrel/sales_engine/milestones{/number}","notifications_url":"https://api.github.com/repos/chelseaworrel/sales_engine/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/chelseaworrel/sales_engine/labels{/name}","releases_url":"https://api.github.com/repos/chelseaworrel/sales_engine/releases{/id}","created_at":"2015-03-03T17:55:04Z","updated_at":"2015-03-05T16:02:35Z","pushed_at":"2015-03-05T16:37:23Z","git_url":"git://github.com/chelseaworrel/sales_engine.git","ssh_url":"git@github.com:chelseaworrel/sales_engine.git","clone_url":"https://github.com/chelseaworrel/sales_engine.git","svn_url":"https://github.com/chelseaworrel/sales_engine","homepage":null,"size":0,"stargazers_count":0,"watchers_count":0,"language":"CSS","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":8,"forks":0,"open_issues":8,"watchers":0,"default_branch":"master"}},"base":{"label":"chelseaworrel:master","ref":"master","sha":"f4304166ee2d4cd33674cba247af3d3e7ac8832d","user":{"login":"chelseaworrel","id":9851891,"avatar_url":"https://avatars.githubusercontent.com/u/9851891?v=3","gravatar_id":"","url":"https://api.github.com/users/chelseaworrel","html_url":"https://github.com/chelseaworrel","followers_url":"https://api.github.com/users/chelseaworrel/followers","following_url":"https://api.github.com/users/chelseaworrel/following{/other_user}","gists_url":"https://api.github.com/users/chelseaworrel/gists{/gist_id}","starred_url":"https://api.github.com/users/chelseaworrel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/chelseaworrel/subscriptions","organizations_url":"https://api.github.com/users/chelseaworrel/orgs","repos_url":"https://api.github.com/users/chelseaworrel/repos","events_url":"https://api.github.com/users/chelseaworrel/events{/privacy}","received_events_url":"https://api.github.com/users/chelseaworrel/received_events","type":"User","site_admin":false},"repo":{"id":31612636,"name":"sales_engine","full_name":"chelseaworrel/sales_engine","owner":{"login":"chelseaworrel","id":9851891,"avatar_url":"https://avatars.githubusercontent.com/u/9851891?v=3","gravatar_id":"","url":"https://api.github.com/users/chelseaworrel","html_url":"https://github.com/chelseaworrel","followers_url":"https://api.github.com/users/chelseaworrel/followers","following_url":"https://api.github.com/users/chelseaworrel/following{/other_user}","gists_url":"https://api.github.com/users/chelseaworrel/gists{/gist_id}","starred_url":"https://api.github.com/users/chelseaworrel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/chelseaworrel/subscriptions","organizations_url":"https://api.github.com/users/chelseaworrel/orgs","repos_url":"https://api.github.com/users/chelseaworrel/repos","events_url":"https://api.github.com/users/chelseaworrel/events{/privacy}","received_events_url":"https://api.github.com/users/chelseaworrel/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/chelseaworrel/sales_engine","description":"sales_engine project module one (Turing)","fork":false,"url":"https://api.github.com/repos/chelseaworrel/sales_engine","forks_url":"https://api.github.com/repos/chelseaworrel/sales_engine/forks","keys_url":"https://api.github.com/repos/chelseaworrel/sales_engine/keys{/key_id}","collaborators_url":"https://api.github.com/repos/chelseaworrel/sales_engine/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/chelseaworrel/sales_engine/teams","hooks_url":"https://api.github.com/repos/chelseaworrel/sales_engine/hooks","issue_events_url":"https://api.github.com/repos/chelseaworrel/sales_engine/issues/events{/number}","events_url":"https://api.github.com/repos/chelseaworrel/sales_engine/events","assignees_url":"https://api.github.com/repos/chelseaworrel/sales_engine/assignees{/user}","branches_url":"https://api.github.com/repos/chelseaworrel/sales_engine/branches{/branch}","tags_url":"https://api.github.com/repos/chelseaworrel/sales_engine/tags","blobs_url":"https://api.github.com/repos/chelseaworrel/sales_engine/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/chelseaworrel/sales_engine/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/chelseaworrel/sales_engine/git/refs{/sha}","trees_url":"https://api.github.com/repos/chelseaworrel/sales_engine/git/trees{/sha}","statuses_url":"https://api.github.com/repos/chelseaworrel/sales_engine/statuses/{sha}","languages_url":"https://api.github.com/repos/chelseaworrel/sales_engine/languages","stargazers_url":"https://api.github.com/repos/chelseaworrel/sales_engine/stargazers","contributors_url":"https://api.github.com/repos/chelseaworrel/sales_engine/contributors","subscribers_url":"https://api.github.com/repos/chelseaworrel/sales_engine/subscribers","subscription_url":"https://api.github.com/repos/chelseaworrel/sales_engine/subscription","commits_url":"https://api.github.com/repos/chelseaworrel/sales_engine/commits{/sha}","git_commits_url":"https://api.github.com/repos/chelseaworrel/sales_engine/git/commits{/sha}","comments_url":"https://api.github.com/repos/chelseaworrel/sales_engine/comments{/number}","issue_comment_url":"https://api.github.com/repos/chelseaworrel/sales_engine/issues/comments{/number}","contents_url":"https://api.github.com/repos/chelseaworrel/sales_engine/contents/{+path}","compare_url":"https://api.github.com/repos/chelseaworrel/sales_engine/compare/{base}...{head}","merges_url":"https://api.github.com/repos/chelseaworrel/sales_engine/merges","archive_url":"https://api.github.com/repos/chelseaworrel/sales_engine/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/chelseaworrel/sales_engine/downloads","issues_url":"https://api.github.com/repos/chelseaworrel/sales_engine/issues{/number}","pulls_url":"https://api.github.com/repos/chelseaworrel/sales_engine/pulls{/number}","milestones_url":"https://api.github.com/repos/chelseaworrel/sales_engine/milestones{/number}","notifications_url":"https://api.github.com/repos/chelseaworrel/sales_engine/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/chelseaworrel/sales_engine/labels{/name}","releases_url":"https://api.github.com/repos/chelseaworrel/sales_engine/releases{/id}","created_at":"2015-03-03T17:55:04Z","updated_at":"2015-03-05T16:02:35Z","pushed_at":"2015-03-05T16:37:23Z","git_url":"git://github.com/chelseaworrel/sales_engine.git","ssh_url":"git@github.com:chelseaworrel/sales_engine.git","clone_url":"https://github.com/chelseaworrel/sales_engine.git","svn_url":"https://github.com/chelseaworrel/sales_engine","homepage":null,"size":0,"stargazers_count":0,"watchers_count":0,"language":"CSS","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":8,"forks":0,"open_issues":8,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/chelseaworrel/sales_engine/pulls/12"},"html":{"href":"https://github.com/chelseaworrel/sales_engine/pull/12"},"issue":{"href":"https://api.github.com/repos/chelseaworrel/sales_engine/issues/12"},"comments":{"href":"https://api.github.com/repos/chelseaworrel/sales_engine/issues/12/comments"},"review_comments":{"href":"https://api.github.com/repos/chelseaworrel/sales_engine/pulls/12/comments"},"review_comment":{"href":"https://api.github.com/repos/chelseaworrel/sales_engine/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/chelseaworrel/sales_engine/pulls/12/commits"},"statuses":{"href":"https://api.github.com/repos/chelseaworrel/sales_engine/statuses/65276980684546a6012baff93b642c7cd80ad850"}}}}