This version (2017/05/27 13:44) is a draft.
Approvals: 0/1

[00:07:30] <ivanovdns> Hi there! Could some please help with resolving conflicts on github. I've made some fixes in template engines implementations and after a while they are became obsolete.. So, now I have some conflicts: https://github.com/vert-x3/vertx-web/pull/560/conflicts. What should I do for save my code and consider differences?

[14:50:12] * ChanServ sets mode: +o temporalfox [16:43:22] * ChanServ sets mode: +o purplefox

[17:27:09] * ChanServ sets mode: +o purplefox [21:35:15] * ChanServ sets mode: +o temporalfox

[23:07:02] *** ChanServ sets mode: +o purplefox