Skip to content

#4 rename common keywords and reorder properties on item classes - #13

Merged
shinchris merged 3 commits into
developmentfrom
bugfix-4-rename_keywords
Sep 7, 2016
Merged

shinchris merged 3 commits into
developmentfrom
bugfix-4-rename_keywords

Conversation

@shinchris

Copy link
Copy Markdown
Contributor

Renamed the words 'file' and 'input' used throughout the codebase.
Also reorganized properties on item classes.

@shinchris
shinchris changed the base branch from master to development September 6, 2016 20:56
Comment thread .travis.yml
@@ -0,0 +1,17 @@
language: python

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

All of your PRs have this commit, which is causing merge conflicts, it'll need to be removed from these branches I think

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Hey @t8y8 this is a product of the rebasing usually if you don't force push to the branch, I'll take a look at Chris' changes on his machine when he gets in to make sure

@t8y8

t8y8 commented Sep 7, 2016

Copy link
Copy Markdown
Contributor

🚀 for the rename of the variables (Thanks for the quick turnaround!!) -- but this PR has a lot in it that might be part of your other checkins?

@shinchris shinchris changed the title #4 rename common keywords #4 rename common keywords and reorder properties on item classes Sep 7, 2016
@shinchris
shinchris merged commit 1256c88 into development Sep 7, 2016
@shinchris
shinchris deleted the bugfix-4-rename_keywords branch September 7, 2016 18:17
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.

3 participants