Create New Item
Item Type
File
Folder
Item Name
Search file in folder and subfolders...
Are you sure want to rename?
primogenial
/
themes
/
storefront
/
vendor
/
squizlabs
/
php_codesniffer
/
src
/
Standards
/
Generic
/
Tests
/
VersionControl
:
GitMergeConflictUnitTest.js
Advanced Search
Upload
New Item
Settings
Back
Back Up
Advanced Editor
Save
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 */