Skip to content

Commit 17281ed

Browse files
author
LocalIdentity
committed
Fix conflict
1 parent a8157da commit 17281ed

2 files changed

Lines changed: 0 additions & 16 deletions

File tree

src/Modules/Main.lua

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,6 @@ function main:Init()
114114
self.showAnimations = true
115115
self.errorReadingSettings = false
116116

117-
if self.userPath then
118-
self:ChangeUserPath(self.userPath, ignoreBuild)
119-
end
120-
121117
if launch.devMode and IsKeyDown("CTRL") or os.getenv("REGENERATE_MOD_CACHE") == "1" then
122118
-- If modLib.parseMod doesn't find a cache entry it generates it.
123119
-- Not loading pre-generated cache causes it to be rebuilt

src/Modules/Main.lua.rej

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)