/*
 * MIT License
 *
 * Copyright (c) 2017-2019 RiiConnect24 and its contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files
 * (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge,
 * publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do
 * so, subject to the following conditions:
 *
 * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
 * LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO
 * EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
 * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */

package xyz.rc24.bot.core;

import net.dv8tion.jda.core.entities.Guild;
import xyz.rc24.bot.core.entities.CodeType;
import xyz.rc24.bot.core.entities.GuildSettings;

import java.util.Map;

@SuppressWarnings("unused")
public interface BotCore
{
<<<<<<< HEAD:src/main/java/xyz/rc24/bot/core/BotCore.java
    GuildSettings getGuildSettings(Guild guild);

    GuildSettings getGuildSettings(long guild);

    Map<CodeType, Map<String, String>> getAllCodes(long user);

    Map<String, String> getCodesForType(CodeType type, long user);
=======
    public String token;
    public String prefix;
    public String playing;
    public Long primary_owner;
    public Long[] secondary_owners;
    public OnlineStatus status;
    public Boolean debug;
    public Long root_server;
    public Boolean patch_mail;
    public Boolean morpher_enabled;
    public Long morpher_root;
    public Long morpher_mirror;
    public Boolean birthdays_enabled;
    public Long birthdays_channel;
    public List<Long> logged_servers;
    public List<Long> ignore_ids;
    public String sentry_dsn;
    public boolean sentry_enabled;
    public boolean music_night_reminder;
    public boolean raid_prevention;
>>>>>>> java:src/main/java/xyz/rc24/bot/loader/ConfigFormat.java
}

@@ -1388,66 +1388,8 @@
 e%0A%7B%0A
-%3C%3C%3C%3C%3C%3C%3C HEAD:src/main/java/xyz/rc24/bot/core/BotCore.java%0A
     
@@ -1618,727 +1618,6 @@
 r);%0A
-=======%0A    public String token;%0A    public String prefix;%0A    public String playing;%0A    public Long primary_owner;%0A    public Long%5B%5D secondary_owners;%0A    public OnlineStatus status;%0A    public Boolean debug;%0A    public Long root_server;%0A    public Boolean patch_mail;%0A    public Boolean morpher_enabled;%0A    public Long morpher_root;%0A    public Long morpher_mirror;%0A    public Boolean birthdays_enabled;%0A    public Long birthdays_channel;%0A    public List%3CLong%3E logged_servers;%0A    public List%3CLong%3E ignore_ids;%0A    public String sentry_dsn;%0A    public boolean sentry_enabled;%0A    public boolean music_night_reminder;%0A    public boolean raid_prevention;%0A%3E%3E%3E%3E%3E%3E%3E java:src/main/java/xyz/rc24/bot/loader/ConfigFormat.java%0A
 %7D%0A

fix conflicts