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

Opensprinkler #511

Merged
merged 13 commits into from
Jun 10, 2015
Merged

Opensprinkler #511

merged 13 commits into from
Jun 10, 2015

Conversation

hplato
Copy link
Collaborator

@hplato hplato commented Jun 9, 2015

Add in basic support for interfacing with the Opensprinkler device

@hollie
Copy link
Owner

hollie commented Jun 9, 2015

Hey @hplato
could it be that you accidentally added the same file twice? Or am I misinterpreting the overview under 'files changed'?

Best regards,
Lieven.

@hplato
Copy link
Collaborator Author

hplato commented Jun 9, 2015

Maybe? I originally called it Opensprinkler.pm, but then renamed it to OpenSprinkler.pm to be more consistent with the product at a mid-point while testing with Brian

Sent from my mobile device.

On Jun 9, 2015, at 3:28 PM, Lieven Hollevoet notifications@github.com wrote:

Hey @hplato
could it be that you accidentally added the same file twice? Or am I misinterpreting the overview under 'files changed'?

Best regards,
Lieven.


Reply to this email directly or view it on GitHub.

@hollie
Copy link
Owner

hollie commented Jun 9, 2015

No, I mean the file that is under lib/OpenSprinkler.pm (= the correct one) and the file that is directly under the root of the repo (that one is probably incorrect)?

@hplato
Copy link
Collaborator Author

hplato commented Jun 9, 2015

Yup, no idea why there is one on the root. Just the lib one

Sent from my mobile device.

On Jun 9, 2015, at 3:48 PM, Lieven Hollevoet notifications@github.com wrote:

No, I mean the file that is under lib/OpenSprinkler.pm (= the correct one) and the file that is directly under the root of the repo (that one is probably incorrect)?


Reply to this email directly or view it on GitHub.

@hollie
Copy link
Owner

hollie commented Jun 10, 2015

Hey @hplato,

if the file in the root is not required (as I assume it is), could you please in your branch remove the file, commit the change and push that change to your repo? Then the pull request gets updated and I can merge your change request easily.

To remove it, just do in the root of the clone (on the open sprinkler branch)

git rm OpenSprinkler.pm
git commit -m "Removed file that was added at the wrong location"
git puh origin opensprinkler

Thanks!
Lieven.

@hollie
Copy link
Owner

hollie commented Jun 10, 2015

By the way: you added the file in the root 3 weeks ago, in commit 0844130

@hplato
Copy link
Collaborator Author

hplato commented Jun 10, 2015

Done!

On Jun 10, 2015, at 12:10 AM, Lieven Hollevoet notifications@github.com wrote:

Hey @hplato https://github.com/hplato,

if the file in the root is not required (as I assume it is), could you please in your branch remove the file, commit the change and push that change to your repo? Then the pull request gets updated and I can merge your change request easily.

To remove it, just do in the root of the clone (on the open sprinkler branch)

git rm OpenSprinkler.pm
git commit -m "Removed file that was added at the wrong location"
git puh origin opensprinkler
Thanks!
Lieven.


Reply to this email directly or view it on GitHub #511 (comment).

hollie added a commit that referenced this pull request Jun 10, 2015
Opensprinkler initial support.
@hollie hollie merged commit f7b30d3 into hollie:master Jun 10, 2015
@hollie
Copy link
Owner

hollie commented Jun 10, 2015

Merged! Thanks for the contribution!

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