fterrier/kevin — comment on commit e0d5b6a11237ffbd3885ab35c3a7106021698351
File:  line 0
By kahigiso:

Okay Some many Sh*t I have just check what can conflict with my previous changes and found none! So you are good to merge the Sh*t