akkartik/driver.love - Change RE27V72KZK4CKZ5UAXZYPZV7KCU3LFAQZ5YP3I2GKIS37OSOCZSAC

resolve conflicts

Created by akkartik on July 26, 2024

RE27V72KZK4CKZ5UAXZYPZV7KCU3LFAQZ5YP3I2GKIS37OSOCZSAC

Dependencies

In channels

main

Change contents

File un-deletion: 0426-A, 0426-A
BFD:BF[4.146] → [5.6019:6019]
BFD:BF[5.6695] → [5.6019:6019]
BFD:BF[7.2] → [5.6665:6695]
BFD:BF[7.2] → [5.6665:6695]
Replacement in 0028-A at line 12 [8.2646]
B:BD[8.3022] → [6.384:389]
```
	B()
```
[8.3022]
[8.3061]
```
	B(font)
```
Replacement in 0028-A at line 14 [8.2646]
B:BD[8.3121] → [2.191:194]
```
end
```
[8.3121]
```
end
```
Deletion in 0021-compute_layout at line 1 [9.4307]
B:BD[9.4307] → [10.424:484]
```
compute_layout = function(node, x,y, nodes_to_render, font)
```
Deletion in 0021-compute_layout at line 34 [9.4307]
B:BD[9.5191] → [10.485:518]
```
			update_editor_box(node, font)
```
Deletion in 0021-compute_layout at line 62 [9.4307]
B:BD[9.6029] → [10.519:587]
```
			subx,suby = compute_layout(child, x,suby, nodes_to_render, font)
```
Deletion in 0021-compute_layout at line 90 [9.4307]
B:BD[9.6717] → [10.588:656]
```
			subx,suby = compute_layout(child, subx,y, nodes_to_render, font)
```
Deletion in 0019-B at line 1 [11.6168]
B:BD[11.6168] → [6.633:648]
∅:D[6.648] → [12.974:988]
B:BD[13.817] → [12.974:988]
B:BD[12.988] → [6.650:650]
```
B = function()
--	print('B')
```
Insertion in 0019-B at line 2 [11.6168]
[3.508]
[14.4517]
```
--	print('B')
```
Resurrecting zombie bytes in 0019-B at line 22 [11.6168]
∅:∅[15.266] → [14.5090:5188]
∅:∅[16.591] → [14.5090:5188]
∅:∅[3.608] → [14.5090:5188]
∅:∅[13.875] → [14.5090:5188]
∅:∅[17.2253] → [14.5090:5188]
B:B[13.875] → [14.5090:5188]
B:B[17.2253] → [14.5090:5188]
B:B[14.5090] → [14.5090:5188]
BD:B[15.266] → [14.5090:5188]
```
			else
				obj.text = love.graphics.newText(love.graphics.getFont(), obj.data)
			end
		end
	end
```
Replacement in 0019-B at line 27 [11.6168]
B:BD[14.5188] → [18.171:174]
```
end
```
[14.5188]
```
end
```

resolve conflicts

Dependencies

In channels

Change contents

File un-deletion: 0426-A, 0426-A

Replacement in 0028-A at line 12 [8.2646]

Replacement in 0028-A at line 14 [8.2646]

Deletion in 0021-compute_layout at line 1 [9.4307]

Deletion in 0021-compute_layout at line 34 [9.4307]

Deletion in 0021-compute_layout at line 62 [9.4307]

Deletion in 0021-compute_layout at line 90 [9.4307]

Deletion in 0019-B at line 1 [11.6168]

Insertion in 0019-B at line 2 [11.6168]

Resurrecting zombie bytes in 0019-B at line 22 [11.6168]

Replacement in 0019-B at line 27 [11.6168]