Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev/rename to symon #27

Merged
merged 3 commits into from
Oct 4, 2019
Merged

Conversation

trottier
Copy link
Contributor

@trottier trottier commented Oct 4, 2019

Performed rename of Simon to Symon.

@trottier trottier requested a review from JelmerT October 4, 2019 18:58
@trottier trottier force-pushed the dev/rename-to-symon branch 2 times, most recently from 01821f9 to aa2338e Compare October 4, 2019 19:39
@JelmerT
Copy link
Member

JelmerT commented Oct 4, 2019

Something weird happened somewhere, best to rebase your commits on top of the current master.

Some file names were renamed back to 016 instead of 017, and some changes in the current master were reverted.

Copy link
Member

@JelmerT JelmerT left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some files were renamed / added (016 - 017)

@@ -0,0 +1,2 @@
name=Symon
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
name=Symon
name=symon

needs to match the filename

games.json Outdated
@@ -148,25 +148,17 @@
"author": "CleverPet <[email protected]>",
"description_sentence":"Once your dog or cat can see the lights easily, this is a more \"active\" game for the Hub that challenges your dog or cat's \"paw-eye\" coordination",
"description_paragraph":"",
"type": "github.com",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"type": "github.com",

This shouldnt be here

@JelmerT JelmerT force-pushed the dev/rename-to-symon branch from 61d80eb to 064b230 Compare October 4, 2019 21:01
@JelmerT
Copy link
Member

JelmerT commented Oct 4, 2019

Rebased, fixed all the issues and added a standard readme for the Symon game.

👍

@JelmerT JelmerT merged commit a6e2ba4 into CleverPet:master Oct 4, 2019
@trottier
Copy link
Contributor Author

trottier commented Oct 4, 2019

Yes, I've fixed my current master so this won't happen again.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants