Re: [go-nuts] Pulling golang/go causes a merge conflict. Is it just me :(

2018-11-22 Thread Jan Mercl
On Thu, Nov 22, 2018 at 7:34 PM Muhammad Falak R Wani wrote: See https://groups.google.com/d/msg/golang-dev/8JmYrD3DWY0/oNVcA29FBgAJ -- -j -- You received this message because you are subscribed to the Google Groups "golang-nuts" group. To unsubscribe from this group and stop receiving

[go-nuts] Pulling golang/go causes a merge conflict. Is it just me :(

2018-11-22 Thread Muhammad Falak R Wani
I am pretty sure I did not touch anything on my local master. Any fixes -mfrw -- You received this message because you are subscribed to the Google Groups "golang-nuts" group. To unsubscribe from this group and stop receiving emails from it, send an email to