git change markers in changelog popup

[Yay295]

ytc-filter/src/components/popout.vue

Lines 165 to 174 in e6c3630

	<<<<<<< Updated upstream
	<h4>2.1.3 Bugfixes</h4>
	<ul>
	<li>Remove block/report button cleanly so that Youtube's livechat can recycle them</li>
	<li>Optimize migration to 2.1.x. It should prevent high CPU/RAM usage during migration, if you haven't migrated already.</li>
	<li>Fix filtering by role in other language than English</li>
	<li>Avoid disconnecting chat when other extensions which require to patch Fetch like LiveTL are enabled</li>
	</ul>
	======= >>>>>>> Stashed changes