Closed brennx0r closed 10 years ago
I have pulled from upstream master and merged the conflicts.
Nice!
Can you delete the .orig files? We won't need them after the merge. :)
.orig
D'oh! Removed *.orig files.
:heart: :heart: :heart:
I have pulled from upstream master and merged the conflicts.