File "GitMergeConflictUnitTest.js"
Full Path: /home/warrior1/public_html/themes/storefront/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.js
File size: 365 bytes
MIME-type: text/plain
Charset: utf-8
result = x?y:z;
result = x ? y : z;
<<<<<<< HEAD
if (something === true
=======
if (something === false
>>>>>>> develop
^ somethingElse === true
) {
<<<<<<< HEAD
return true;
=======
return false;
>>>>>>> develop
}
y = 1
+ 2
- 3;
/*
<<<<<<< HEAD
* @var string $bar
*/
if (something === true
/**
=======
* @var string $foo
>>>>>>> master
*/