akkartik/template-carousel-mobile - Change RUB7L6GYFGVH7NMTWSZWLPFVEMJRVDDK75R45ZA3EVRPHGBO5SKAC

resolve conflicts

Created by akkartik on February 18, 2025

RUB7L6GYFGVH7NMTWSZWLPFVEMJRVDDK75R45ZA3EVRPHGBO5SKAC

Dependencies

In channels

main

Change contents

File deletion: source_undo.lua, source_undo.lua

BFD:BFD[5.2] → [6.3457:3496]

BFD:BFD[6.3496] → [6.5:5]

B:BD[6.3150] → [4.135:196]

B:BD[6.3276] → [4.197:218]

B:BD[6.3321] → [4.219:269]

∅:D[4.269] → [6.3365:3456]

∅:D[4.218] → [6.3294:3321]

∅:D[4.196] → [6.3223:3276]

  seen = seen or {}
  if seen[obj] then return seen[obj] end
  seen[obj] = result
    result[deepcopy(k, seen)] = deepcopy(v, seen)
  end
  return result
end
function minmax(a, b)
  return math.min(a,b), math.max(a,b)
end
  for k,v in pairs(obj) do
  local result = setmetatable({}, getmetatable(obj))

File deletion: log.lua, log.lua

BFD:BFD[5.2] → [6.204116:204147]

BFD:BFD[6.204147] → [6.203264:203264]

B:BD[6.203302] → [3.22:262]

B:BD[6.203649] → [3.263:470]

B:BD[6.203803] → [3.471:678]

B:BD[6.203958] → [3.679:818]

∅:D[3.818] → [6.204091:204096]

∅:D[3.678] → [6.203911:203958]

∅:D[3.470] → [6.203757:203803]

∅:D[3.262] → [6.203532:203649]

  local info = debug.getinfo(stack_frame_index, 'Sl')
  local msg
  if type(obj) == 'string' then
    msg = obj
  else
    msg = json.encode(obj)
  end
  love.filesystem.append('log', info.short_src..':'..info.currentline..': '..msg..'\n')
  if stack_frame_index == nil then
    stack_frame_index = 3
  end
  -- I'd like to use the unicode character \u{250c} here, but it doesn't work
  -- in OpenBSD.
  log(stack_frame_index, '[ u250c ' .. name)
  if stack_frame_index == nil then
    stack_frame_index = 3
  end
  -- I'd like to use the unicode character \u{2518} here, but it doesn't work
  -- in OpenBSD.
  log(stack_frame_index, '] u2518 ' .. name)
  if stack_frame_index == nil then
    stack_frame_index = 4
  end
  log_end(name, stack_frame_index)
  log_start(name, stack_frame_index)
end
end
function log_new(name, stack_frame_index)
end
function log_end(name, stack_frame_index)
end
-- for section delimiters we'll use specific Unicode box characters
function log_start(name, stack_frame_index)

Replacement in source_undo.lua at line 87 [8.68]

B:BD[8.3213] → [8.3213:3286]

  if seen and seen[obj] then return seen[obj] end
  local s = seen or {}

[8.3213]

[8.3286]

  seen = seen or {}
  if seen[obj] then return seen[obj] end

Replacement in source_undo.lua at line 90 [8.68]
B:BD[8.3339] → [8.3339:3357]
```
  s[obj] = result
```
[8.3339]
[8.3357]
```
  seen[obj] = result
```

Replacement in source_undo.lua at line 92 [8.68]

B:BD[8.3384] → [8.3384:3428]

    result[deepcopy(k, s)] = deepcopy(v, s)

[8.3384]

[8.3428]

    result[deepcopy(k, seen)] = deepcopy(v, seen)

Replacement in log.lua at line 2 [8.202725]

B:BD[8.202763] → [8.202763:202993]

	local info = debug.getinfo(stack_frame_index, 'Sl')
	local msg
	if type(obj) == 'string' then
		msg = obj
	else
		msg = json.encode(obj)
	end
	love.filesystem.append('log', info.short_src..':'..info.currentline..': '..msg..'\n')

[8.202763]

[8.202993]

  local info = debug.getinfo(stack_frame_index, 'Sl')
  local msg
  if type(obj) == 'string' then
    msg = obj
  else
    msg = json.encode(obj)
  end
  love.filesystem.append('log', info.short_src..':'..info.currentline..': '..msg..'\n')

Replacement in log.lua at line 14 [8.202725]

B:BD[8.203110] → [8.203110:203173]

B:BD[8.203173] → [7.275:412]

	if stack_frame_index == nil then
		stack_frame_index = 3
	end
	-- I'd like to use the unicode character \u{250c} here, but it doesn't work
	-- in OpenBSD.
	log(stack_frame_index, '[ u250c ' .. name)

[8.203110]

[8.203218]

  if stack_frame_index == nil then
    stack_frame_index = 3
  end
  -- I'd like to use the unicode character \u{250c} here, but it doesn't work
  -- in OpenBSD.
  log(stack_frame_index, '[ u250c ' .. name)

Replacement in log.lua at line 22 [8.202725]

B:BD[8.203264] → [8.203264:203327]

B:BD[8.203327] → [7.413:550]

	if stack_frame_index == nil then
		stack_frame_index = 3
	end
	-- I'd like to use the unicode character \u{2518} here, but it doesn't work
	-- in OpenBSD.
	log(stack_frame_index, '] u2518 ' .. name)

[8.203264]

[8.203372]

  if stack_frame_index == nil then
    stack_frame_index = 3
  end
  -- I'd like to use the unicode character \u{2518} here, but it doesn't work
  -- in OpenBSD.
  log(stack_frame_index, '] u2518 ' .. name)

Replacement in log.lua at line 31 [8.202725]

B:BD[8.203419] → [8.203419:203552]

	if stack_frame_index == nil then
		stack_frame_index = 4
	end
	log_end(name, stack_frame_index)
	log_start(name, stack_frame_index)

[8.203419]

[8.203552]

  if stack_frame_index == nil then
    stack_frame_index = 4
  end
  log_end(name, stack_frame_index)
  log_start(name, stack_frame_index)