This repository was archived by the owner on Jun 15, 2023. It is now read-only.
Expanded CSGO patchnote description and added formating to factorio descripton#3
Open
silentdot wants to merge 6 commits intoshadowmoose:masterfrom
Open
Expanded CSGO patchnote description and added formating to factorio descripton#3silentdot wants to merge 6 commits intoshadowmoose:masterfrom
silentdot wants to merge 6 commits intoshadowmoose:masterfrom
Conversation
shadowmoose
suggested changes
Jun 11, 2020
Owner
shadowmoose
left a comment
shadowmoose
left a comment
There was a problem hiding this comment.
Thanks again for the additions, just a couple small tweaks here. Also, the Factorio icon was updated after your branch was merged to have a transparent background, which this branch will currently overwrite.
If you're willing to fix those problems, I'm happy to merge.
| continue | ||
|
|
||
| <<<<<<< HEAD | ||
| if item.name == "strong": |
Owner
There was a problem hiding this comment.
Thanks for the additions, but it looks like there are some merge issues pending here - mind updating your branch first?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Hey, just some slight fixes :)
CSGO before and after:
Factorio before and after:
