search

city41 / smaghetti

A web based level editor for Super Mario Advance 4, the GBA port of Super Mario Bros 3
https://smaghetti.mattgreer.dev
GNU Affero General Public License v3.0
48 stars 8 forks source link

PileDriverMiniGoomba: Brick fix #160

Closed lelegofrog closed 2 years ago

lelegofrog commented 2 years ago

shiny brick time

vercel[bot] commented 2 years ago

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployment, click below or on the icon next to each commit.

🔍 Inspect: https://vercel.com/city41/smaghetti/87mfsgHTyGdoiSTu3F2D1gambhhu
✅ Preview: https://smaghetti-git-fork-lelegofrog-main-city41.vercel.app

lelegofrog commented 2 years ago

hm is the conflict the merge?

city41 commented 2 years ago

there wasn't really a conflict. I had restricted this repo to only allow rebases, which is a more advanced but harder to use way of merging. but I turned that off just now.