Skip to content

Commit 7372056

Browse files
author
LocalIdentity
committed
Fix merge conflict
1 parent 4153e67 commit 7372056

File tree

4 files changed

+2
-24
lines changed

4 files changed

+2
-24
lines changed

src/HeadlessWrapper.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ function OpenURL(url) end
157157
function SetProfiling(isEnabled) end
158158
function Restart() end
159159
function Exit() end
160+
function TakeScreenshot() end
160161

161162
---@return string? provider
162163
---@return string? version

src/HeadlessWrapper.lua.rej

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

src/Modules/BuildSiteTools.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ function buildSites.DownloadBuild(link, websiteInfo, callback)
103103
end
104104

105105
-- Parses and converts URI's to import links. Currently only supports protocol handler URI's, extend as needed.
106-
-- @param uri String Example: pob2://pobbin/<id> or pob2://poeninja/<id>
106+
--- @param uri string Example: pob2://pobbin/<id> or pob2://poeninja/<id>
107107
function buildSites.ParseImportLinkFromURI(uri)
108108
local importLink = nil
109109

src/Modules/BuildSiteTools.lua.rej

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

0 commit comments

Comments
 (0)