search

camerongillette / factorio_blueprint_editor

Online Editor for Elxeno's Factorio Blueprint Editor
Other
86 stars 13 forks source link

Formatted the HTML, JavaScript and CSS for better readability #1

Closed SerendipityNL closed 6 years ago

SerendipityNL commented 6 years ago

I commented on your post. Here's the pull request

Armienn commented 6 years ago

Oh my. Improving the formatting certainly seems like at good move.

camerongillette commented 6 years ago

@SerendipityNL Can you add a new line at the end of the file so git doesn't freak out later?

SerendipityNL commented 6 years ago

Fixed the new lines, but now github is throwing the conflict that was created in the Factorio.html file. What's the best way to resolve it?

SerendipityNL commented 6 years ago

Okay, I haven't done enough of these pull requests to get this right. Shall I start a new fork and work my way around this mess that I created?

camerongillette commented 6 years ago

So @SerendipityNL, I got the original source files from the author which conflicts hard with this PR. However, we can still use some reformatting. Would it be ok for you to either close this one, or rework your commit to accomodate the new source files?

SerendipityNL commented 6 years ago

I'll close this one and start a new one!