01:32 -!- HanClinto has joined #tnnt
01:37 -!- HanClinto has quit [Ping timeout: 258 seconds]
04:16 -!- truculent has joined #tnnt
04:25 -!- Kontroller1 has joined #tnnt
04:27 -!- Kontroller has quit [Ping timeout: 272 seconds]
08:05 -!- truculent has quit [Quit: Konversation terminated!]
11:34 -!- HanClinto has joined #tnnt
11:38 -!- HanClinto has quit [Ping timeout: 255 seconds]
13:01 -!- Not-a789 has joined #tnnt
13:01 <Not-a789> [tnnt] k21971 pushed 23 commits [+6/-0/±107] https://git.io/JvKsB
13:01 <Not-a789> [tnnt] nhmall 831dc15 - post-release
13:01 <Not-a789> [tnnt] nhmall ee15f67 - fixes36.5 update
13:01 <Not-a789> [tnnt] nhmall 9cd6947 - travis bit post-release
13:01 <Not-a789> [tnnt] ... and 20 more commits.
13:01 <K2> ^ 3.6.6 update
13:01 <K2> no merge conflicts for once
19:06 -!- tacco\unfoog has joined #tnnt
20:08 <Kontroller1> K2: What went wrong, then?
22:27 <K2> sometimes merging vanilla updates into a variant, you get merge conflicts
22:27 <K2> some are easy to correct, others not so much
22:27 <K2> its nice when a merge happens cleanly
22:28 -!- K2 has left #tnnt
22:29 -!- K2 has joined #tnnt
22:29 -!- mode/#tnnt [+o K2] by ChanServ
22:42 -!- K2 has quit [Quit: *poof*]
22:42 -!- K2 has joined #tnnt
22:42 -!- mode/#tnnt [+o K2] by ChanServ
23:07 -!- tacco\unfoog has quit []