Opensprinkler

[hplato]

Add in basic support for interfacing with the Opensprinkler device

[hollie]

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]

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 [email protected] 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]

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]

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 [email protected] 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]

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]

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

[hplato]

Done!

On Jun 10, 2015, at 12:10 AM, Lieven Hollevoet [email protected] 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]

Merged! Thanks for the contribution!