PHP Classes

File: vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.2.inc

Recommend this page to a friend!
  Classes of milenmk   Simple PHP Password Manager   vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.2.inc   Download  
File: vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.2.inc
Role: Auxiliary data
Content type: text/plain
Description: Auxiliary data
Class: Simple PHP Password Manager
Application to store and retrieve user password
Author: By
Last change:
Date: 1 year ago
Size: 449 bytes
 

Contents

Class file image Download 
<?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