You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Merge remote-tracking branch 'upstream/master'
I had a fix on my branch for a long time that for some reason I
forgot to send upstream.
Conflicts:
persistent-mysql/persistent-mysql.cabal