Skip to content

Commit

Permalink
resolved merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@enricofer
enricofer committed Jan 29, 2016
2 parents 14394da + 6601e42 commit 05c219e
Showing 1 changed file with 818 additions and 819 deletions.
Loading

3 comments on commit 05c219e

@czalaviek
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks you have left my changes to handling button signals in new version in changeDataSource.py

@enricofer
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made some mistakes merging your pull req. Sorry, I'm not a git guru.
Would you resubmit a correct pull req Please?

@czalaviek
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll try.

Please sign in to comment.