MajorHavoc, 9 months ago

<span style="color:#323232;">git merge feature/Australia
</span><span style="color:#323232;">97 conflicts
</span><span style="color:#323232;">git commit -am </span><span style="color:#183691;">'Whatever, I'</span><span style="color:#323232;">m tired.</span><span style="color:#183691;">'
</span><span style="color:#183691;">git push -f
</span>