Git you fucking piece of shit

This commit is contained in:
Video 2023-04-05 16:25:14 -06:00 committed by GitHub
parent 48aabaa878
commit 4b3c31f0e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -36,12 +36,8 @@ public enum SnowflakeEntry
return Snowflake.of(entry.getString()); return Snowflake.of(entry.getString());
} }
<<<<<<< HEAD
public static Set<Snowflake> acceptableRoleIDs() public static Set<Snowflake> acceptableRoleIDs()
{ {
=======
public static Set<Snowflake> acceptableRoleIDs() {
>>>>>>> refs/remotes/origin/RELEASE-2023.03
Set<Snowflake> acceptableRoleIDs = new HashSet<>(); Set<Snowflake> acceptableRoleIDs = new HashSet<>();
acceptableRoleIDs.add(SnowflakeEntry.OWNER_ROLE_ID.getSnowflake()); acceptableRoleIDs.add(SnowflakeEntry.OWNER_ROLE_ID.getSnowflake());
acceptableRoleIDs.add(SnowflakeEntry.DEVELOPER_ROLE_ID.getSnowflake()); acceptableRoleIDs.add(SnowflakeEntry.DEVELOPER_ROLE_ID.getSnowflake());