ahutchings
commented
9 years ago This pull request conflicts with the latest in the 3.3 branch. Would you please rebase against 3.3 or submit a new pull request?
Closed seyfer closed 9 years ago
ahutchings
commented
9 years ago This pull request conflicts with the latest in the 3.3 branch. Would you please rebase against 3.3 or submit a new pull request?
seyfer
commented
9 years ago I don't understand why it with conflicts? I'm just fork, add my modules to .gitmodules and pull. What I should to do? Can you explain?
^_^