diff options
| author | DoKM <mcazzyman@gmail.com> | 2021-07-22 09:57:31 +0200 |
|---|---|---|
| committer | DoKM <mcazzyman@gmail.com> | 2021-07-22 09:57:31 +0200 |
| commit | befa3f0f8aeb0166bf84dddd14f6b4fabc236cf0 (patch) | |
| tree | 4ef5014cf74f57ef52fa2650703de7b8f1153f6c /src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java | |
| parent | aebc16a2a5ca9c20affc27eb5a45cd9a95085168 (diff) | |
| parent | c1c4562b42d53ec2e8885c48f97249d7768fe1c7 (diff) | |
| download | notenoughupdates-befa3f0f8aeb0166bf84dddd14f6b4fabc236cf0.tar.gz notenoughupdates-befa3f0f8aeb0166bf84dddd14f6b4fabc236cf0.tar.bz2 notenoughupdates-befa3f0f8aeb0166bf84dddd14f6b4fabc236cf0.zip | |
Fix merge conflicts for moulberry
Diffstat (limited to 'src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java')
| -rw-r--r-- | src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java index 86a36f49..4f2e8a93 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java @@ -9,6 +9,7 @@ import com.google.gson.JsonObject; import com.mojang.authlib.Agent; import com.mojang.authlib.minecraft.MinecraftSessionService; import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService; +import com.mojang.authlib.yggdrasil.YggdrasilMinecraftSessionService; import com.mojang.authlib.yggdrasil.YggdrasilUserAuthentication; import io.github.moulberry.notenoughupdates.auction.CustomAHGui; import io.github.moulberry.notenoughupdates.collectionlog.GuiCollectionLog; |