Skip to content

Conversation

@pierreluctg
Copy link
Collaborator

No description provided.

@hardbyte
Copy link
Owner

@christiansandberg just to avoid a merge conflict later can you please incorporate this into your big socketcan PR?

@christiansandberg
Copy link
Collaborator

It should be mergeable since git tracks file renames. Go ahead and merge this and I’ll merge with develop.

@felixdivofelixdivo merged commit 60391e6 into hardbyte:developJun 22, 2018
@pierreluctgpierreluctg deleted the docstring branch August 14, 2018 17:46
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@pierreluctg@hardbyte@christiansandberg@felixdivo