Skip to content

Commit bf72045

Browse files
committed
More conflict fixes
1 parent c4f96a2 commit bf72045

1 file changed

Lines changed: 0 additions & 22 deletions

File tree

region/tourian/main/Metroid Room 1.json

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -376,17 +376,6 @@
376376
"Once grouped, use two more Power Bombs to finish them off."
377377
]
378378
},
379-
{
380-
"link": [1, 1],
381-
"name": "R-Mode Entry",
382-
"entranceCondition": {
383-
"comeInWithRMode": {}
384-
},
385-
"requires": [],
386-
"flashSuitChecked": true,
387-
"blueSuitChecked": true,
388-
"clearsObstacles": ["R-Mode"]
389-
},
390379
{
391380
"id": 12,
392381
"link": [1, 1],
@@ -1748,17 +1737,6 @@
17481737
"Once grouped, use two more Power Bombs to finish them off."
17491738
]
17501739
},
1751-
{
1752-
"link": [2, 2],
1753-
"name": "R-Mode Entry",
1754-
"entranceCondition": {
1755-
"comeInWithRMode": {}
1756-
},
1757-
"requires": [],
1758-
"flashSuitChecked": true,
1759-
"blueSuitChecked": true,
1760-
"clearsObstacles": ["R-Mode"]
1761-
},
17621740
{
17631741
"link": [2, 2],
17641742
"name": "R-Mode Spark Interrupt",

0 commit comments

Comments
 (0)