File "GitMergeConflictUnitTest.7.inc"

Full Path: /home/warrior1/public_html/wp-content/themes/storefront/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.7.inc
File size: 492 bytes
MIME-type: text/plain
Charset: utf-8

 
Open Edit   Advanced Editor   Back 
<!-- Test detecting merge conflicts in inline HTML. -->
<div class="abc">
<<<<<<< HEAD
	<p id="test-this">Testing a merge conflict.</p>
=======
	<p id="test-that">Another text string.</p>
>>>>>>> ref/heads/feature-branch
</div>

<!-- Test detecting merge conflicts in inline HTML. -->
<div class="abc">
<<<<<<< HEAD
	<p id="test-this"><?= 'Testing a merge conflict.'; ?></p>
=======
	<p id="test-that"><?= 'Another text string.'; ?></p>
>>>>>>> ref/heads/feature-branch
</div>

<?= $text; ?>