Skip to content

Resolve old merge conflict#1

Open
ivarveen wants to merge 1 commit intomti-rfid:masterfrom
ivarveen:fix/merge-conflict
Open

Resolve old merge conflict#1
ivarveen wants to merge 1 commit intomti-rfid:masterfrom
ivarveen:fix/merge-conflict

Conversation

@ivarveen
Copy link

@ivarveen ivarveen commented Oct 3, 2015

Dear MTI developers,

I do not know your pull request policy, I found these old merge conflicts while trying to compile, figured other people could also benefit from this fix.

Please close this PR in the event you do not like it.

Yours,
Ivar

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.

1 participant