File "GitMergeConflictUnitTest.2.inc"

Full Path: /home/warrior1/public_html/themes/storefront/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.2.inc
File size: 449 bytes
MIME-type: text/x-php
Charset: utf-8

 
Open Edit   Advanced Editor   Back 
<?php

/**
<<<<<<< HEAD
 * @var string $bar
=======
 * @var string $bar
>>>>>>> master
 */

/*
 * Testing detecting merge conflicts using different comment styles.
 *
<<<<<<< HEAD
 * @var string $bar
 */
public function foo($bar){ }

/*
=======
 * @var string $bar
>>>>>>> master
*/

// Comment
<<<<<<< HEAD
// Second comment line. NOTE: The above opener breaks the tokenizer.
=======
// New second comment line
>>>>>>> master
// Third comment line