{"action":"created","issue":{"url":"https://api.github.com/repos/OHDSI/Atlas/issues/786","repository_url":"https://api.github.com/repos/OHDSI/Atlas","labels_url":"https://api.github.com/repos/OHDSI/Atlas/issues/786/labels{/name}","comments_url":"https://api.github.com/repos/OHDSI/Atlas/issues/786/comments","events_url":"https://api.github.com/repos/OHDSI/Atlas/issues/786/events","html_url":"https://github.com/OHDSI/Atlas/pull/786","id":344088320,"node_id":"MDExOlB1bGxSZXF1ZXN0MjAzNTY2MzY0","number":786,"title":"Added Lazy loading and pagination of Included concepts in Concept Set","user":{"login":"wivern","id":1109753,"node_id":"MDQ6VXNlcjExMDk3NTM=","avatar_url":"https://avatars3.githubusercontent.com/u/1109753?v=4","gravatar_id":"","url":"https://api.github.com/users/wivern","html_url":"https://github.com/wivern","followers_url":"https://api.github.com/users/wivern/followers","following_url":"https://api.github.com/users/wivern/following{/other_user}","gists_url":"https://api.github.com/users/wivern/gists{/gist_id}","starred_url":"https://api.github.com/users/wivern/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/wivern/subscriptions","organizations_url":"https://api.github.com/users/wivern/orgs","repos_url":"https://api.github.com/users/wivern/repos","events_url":"https://api.github.com/users/wivern/events{/privacy}","received_events_url":"https://api.github.com/users/wivern/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":3,"created_at":"2018-07-24T15:26:00Z","updated_at":"2018-08-09T13:39:22Z","closed_at":null,"author_association":"CONTRIBUTOR","pull_request":{"url":"https://api.github.com/repos/OHDSI/Atlas/pulls/786","html_url":"https://github.com/OHDSI/Atlas/pull/786","diff_url":"https://github.com/OHDSI/Atlas/pull/786.diff","patch_url":"https://github.com/OHDSI/Atlas/pull/786.patch"},"body":"closes OHDSI/WebAPI#497"},"comment":{"url":"https://api.github.com/repos/OHDSI/Atlas/issues/comments/411760504","html_url":"https://github.com/OHDSI/Atlas/pull/786#issuecomment-411760504","issue_url":"https://api.github.com/repos/OHDSI/Atlas/issues/786","id":411760504,"node_id":"MDEyOklzc3VlQ29tbWVudDQxMTc2MDUwNA==","user":{"login":"chrisknoll","id":6818777,"node_id":"MDQ6VXNlcjY4MTg3Nzc=","avatar_url":"https://avatars0.githubusercontent.com/u/6818777?v=4","gravatar_id":"","url":"https://api.github.com/users/chrisknoll","html_url":"https://github.com/chrisknoll","followers_url":"https://api.github.com/users/chrisknoll/followers","following_url":"https://api.github.com/users/chrisknoll/following{/other_user}","gists_url":"https://api.github.com/users/chrisknoll/gists{/gist_id}","starred_url":"https://api.github.com/users/chrisknoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/chrisknoll/subscriptions","organizations_url":"https://api.github.com/users/chrisknoll/orgs","repos_url":"https://api.github.com/users/chrisknoll/repos","events_url":"https://api.github.com/users/chrisknoll/events{/privacy}","received_events_url":"https://api.github.com/users/chrisknoll/received_events","type":"User","site_admin":false},"created_at":"2018-08-09T13:39:22Z","updated_at":"2018-08-09T13:39:22Z","author_association":"CONTRIBUTOR","body":"@wivern  there is 1 conflict that needs to be resolved:\r\n\r\n```\r\n\t\t</div>\r\n<<<<<<< conceptset_lazy_loading\r\n\t\t<div data-bind=\"css: {'col-xs-10': $component.facets().length > 0, 'col-xs-12': $component.facets().length == 0}\">\r\n\t\t\t<div data-bind=\"css: tableClasses\">\r\n=======\r\n\t\t<div data-bind=\"css: {'faceted-data-table-wrapper': true, 'col-xs-10': $component.facets().length > 0, 'col-xs-12': $component.facets().length == 0}\">\r\n\t\t\t<div class=\"facetedDataTable\">\r\n>>>>>>> master\r\n```\r\n\r\nI'm not sure which side has the right HTML: the PR branch side or master. Can you resolve this conflict and I can do a final test?\r\n"}}
{"actor":{"display_login":"chrisknoll"}}