Skip to content

Conversation

@Kevin-M-Smith
Copy link
Collaborator

I have updated SDI12.cpp and SDI12.h to the latest versions.
Added keywords.txt and two simple examples.

@ghost ghost assigned aufdenkampe Nov 12, 2013
keywords.txt for syntax highlighting, and two new examples: wild card,
change of address
@Kevin-M-Smith
Copy link
Collaborator Author

I've added keywords.txt and two examples.

aufdenkampe added a commit that referenced this pull request Nov 21, 2013
@aufdenkampe aufdenkampe merged commit c12ed0a into EnviroDIY:master Nov 21, 2013
@Kevin-M-Smith
Copy link
Collaborator Author

Excellent!

On Nov 20, 2013, at 9:33 PM, Anthony Aufdenkampe <notifications@github.commailto:notifications@github.com>
wrote:

Merged #1#1.


Reply to this email directly or view it on GitHubhttps://github.com//pull/1.

@aufdenkampe
Copy link
Member

Kevin, I figured out that the issue was that you had modified the LICENSE file in both my MASTER and your FORK. After messing with the command line a bit to no avail, I finally just deleted the LICENSE file on my MASTER and made a new one that was identical to yours. This then allowed me to merge via the GitHub website. So in the end I never needed the command line!

@Kevin-M-Smith
Copy link
Collaborator Author

Ah! Good to know. Learning Git and figuring GitHub will have its growing pains, but I'm convinced it will be worth it.
Especially with what you mentioned about moving beyond software.

On Nov 20, 2013, at 9:49 PM, Anthony Aufdenkampe <notifications@github.commailto:notifications@github.com> wrote:

Kevin, I figured out that the issue was that you had modified the LICENSE file in both my MASTER and your FORK. After messing with the command line a bit to no avail, I finally just deleted the LICENSE file on my MASTER and made a new one that was identical to yours. This then allowed me to merge via the GitHub website. So in the end I never needed the command line!


Reply to this email directly or view it on GitHubhttps://github.com//pull/1#issuecomment-28953872.

SRGDamia1 pushed a commit that referenced this pull request Jul 2, 2020
Add Adafruit pro trinket 3v board support
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