akkartik/pothi.love - Change RIVRY4Y3PPINLV5BQ3A7N2PCXK7ILWSIMJR6D2MGPCLEMTMCPBEQC

resolve conflicts

Created by akkartik on March 19, 2025

RIVRY4Y3PPINLV5BQ3A7N2PCXK7ILWSIMJR6D2MGPCLEMTMCPBEQC

Dependencies

In channels

main

Change contents

Deletion in 0019-B at line 19 [6.6168]
B:BD[5.5046] → [5.5046:5063]
BD:BD[5.5046] → [5.5046:5063]
```
			if obj.w then
```
Deletion in 0010-initialize_editor at line 2 [7.542]
B:BD[7.628] → [8.1089:1185]
BD:BD[7.628] → [8.1089:1185]
∅:D[8.1185] → [9.25186:25241]
B:BD[7.724] → [9.25186:25241]
BD:BD[7.724] → [9.25186:25241]
BD:BD[8.1185] → [9.25186:25241]
B:BD[9.25241] → [10.154:332]
B:BD[10.332] → [3.448:534]
∅:D[3.534] → [11.1279:1335]
B:BD[9.25465] → [11.1279:1335]
BD:BD[3.534] → [11.1279:1335]
BD:BD[9.25465] → [11.1279:1335]
B:BD[11.1335] → [10.334:334]
BD:BD[11.1335] → [10.334:334]
B:BD[7.936] → [10.335:338]
BD:BD[7.936] → [10.335:338]
```
		local scaled_fontsize = scale(20)
		local scaled_lineheight = math.floor(scaled_fontsize*1.3)
		-- HACK: modify obj.editor.left after initialization
		obj.editor = edit.initialize_state(Menu_bar_height + vy(obj.y), math.floor(vx(obj.x)), math.ceil(vx(obj.x+obj.w)), love.graphics.getFont(), scaled_fontsize, scaled_lineheight)
		obj.editor.left = obj.editor.left + Line_number_width*obj.editor.font:getWidth('m')
		obj.editor.width = obj.editor.right - obj.editor.left
end
```

Resurrecting zombie bytes in 0010-initialize_editor at line 2 [7.542]

B:B[7.577] → [4.239:368]

BD:B[7.577] → [4.239:368]

	-- use an editor to wrap the text
	local scaled_fontsize = scale(20)
	local scaled_lineheight = math.floor(scaled_fontsize*1.3)

Replacement in 0010-initialize_editor at line 5 [7.542]

B:BD[4.368] → [4.368:527]

BD:BD[4.368] → [4.368:527]

	obj.editor = edit.initialize_state(vy(obj.y), math.floor(vx(obj.x)), math.ceil(vx(obj.x+obj.w)), love.graphics.getFont(), scaled_fontsize, scaled_lineheight)

[4.368]

[4.527]

	-- HACK: modify obj.editor.left after initialization
	obj.editor = edit.initialize_state(Menu_bar_height + vy(obj.y), math.floor(vx(obj.x)), math.ceil(vx(obj.x+obj.w)), love.graphics.getFont(), scaled_fontsize, scaled_lineheight)
	obj.editor.left = obj.editor.left + Line_number_width*obj.editor.font:getWidth('m')
	obj.editor.width = obj.editor.right - obj.editor.left

Insertion in 0010-initialize_editor at line 11 [7.542]
[4.597]
```
end
```

resolve conflicts

Dependencies

In channels

Change contents

Deletion in 0019-B at line 19 [6.6168]

Deletion in 0010-initialize_editor at line 2 [7.542]

Resurrecting zombie bytes in 0010-initialize_editor at line 2 [7.542]

Replacement in 0010-initialize_editor at line 5 [7.542]

Insertion in 0010-initialize_editor at line 11 [7.542]