{"action":"created","issue":{"url":"https://api.github.com/repos/BlackJar72/DoomlikeDungeons/issues/1","labels_url":"https://api.github.com/repos/BlackJar72/DoomlikeDungeons/issues/1/labels{/name}","comments_url":"https://api.github.com/repos/BlackJar72/DoomlikeDungeons/issues/1/comments","events_url":"https://api.github.com/repos/BlackJar72/DoomlikeDungeons/issues/1/events","html_url":"https://github.com/BlackJar72/DoomlikeDungeons/issues/1","id":96883653,"number":1,"title":"[1.8.2] There are conflict markers in your generated config files","user":{"login":"jesmores","id":125214,"avatar_url":"https://avatars.githubusercontent.com/u/125214?v=3","gravatar_id":"","url":"https://api.github.com/users/jesmores","html_url":"https://github.com/jesmores","followers_url":"https://api.github.com/users/jesmores/followers","following_url":"https://api.github.com/users/jesmores/following{/other_user}","gists_url":"https://api.github.com/users/jesmores/gists{/gist_id}","starred_url":"https://api.github.com/users/jesmores/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jesmores/subscriptions","organizations_url":"https://api.github.com/users/jesmores/orgs","repos_url":"https://api.github.com/users/jesmores/repos","events_url":"https://api.github.com/users/jesmores/events{/privacy}","received_events_url":"https://api.github.com/users/jesmores/received_events","type":"User","site_admin":false},"labels":[],"state":"closed","locked":false,"assignee":null,"milestone":null,"comments":8,"created_at":"2015-07-23T19:00:54Z","updated_at":"2015-07-25T04:41:40Z","closed_at":"2015-07-25T04:41:40Z","body":"chests.cfg as well as the themes config files have conflict markers that look like >>>>> HEAD and <<<<< origin/master - I don't think that was intentional? The dungeons still generate, surprisingly enough, but the loot generation is messed up"},"comment":{"url":"https://api.github.com/repos/BlackJar72/DoomlikeDungeons/issues/comments/124797612","html_url":"https://github.com/BlackJar72/DoomlikeDungeons/issues/1#issuecomment-124797612","issue_url":"https://api.github.com/repos/BlackJar72/DoomlikeDungeons/issues/1","id":124797612,"user":{"login":"jesmores","id":125214,"avatar_url":"https://avatars.githubusercontent.com/u/125214?v=3","gravatar_id":"","url":"https://api.github.com/users/jesmores","html_url":"https://github.com/jesmores","followers_url":"https://api.github.com/users/jesmores/followers","following_url":"https://api.github.com/users/jesmores/following{/other_user}","gists_url":"https://api.github.com/users/jesmores/gists{/gist_id}","starred_url":"https://api.github.com/users/jesmores/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jesmores/subscriptions","organizations_url":"https://api.github.com/users/jesmores/orgs","repos_url":"https://api.github.com/users/jesmores/repos","events_url":"https://api.github.com/users/jesmores/events{/privacy}","received_events_url":"https://api.github.com/users/jesmores/received_events","type":"User","site_admin":false},"created_at":"2015-07-25T04:41:40Z","updated_at":"2015-07-25T04:41:40Z","body":"Looks like it worked. Conflict markers are gone, and dungeons are generating as expected."}}