PHP Classes

File: vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.1.css

Recommend this page to a friend!
  Classes of milenmk   Simple PHP Password Manager   vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.1.css   Download  
File: vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.1.css
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: 771 bytes
 

Contents

Class file image Download
/* * This is a CSS comment. <<<<<<< HEAD * This is a merge conflict... ======= * which should be detected. >>>>>>> ref/heads/feature-branch */ .SettingsTabPaneWidgetType-tab-mid { background: transparent url(tab_inact_mid.png) repeat-x; <<<<<<< HEAD line-height: -25px; ======= line-height: -20px; >>>>>>> ref/heads/feature-branch cursor: pointer; -moz-user-select: none; } /* * The above tests are based on "normal" tokens. * The below test checks that once the tokenizer breaks down because of * unexpected merge conflict boundaries, subsequent boundaries will still * be detected correctly. */ /* * This is a CSS comment. <<<<<<< HEAD * This is a merge conflict... ======= * which should be detected. >>>>>>> ref/heads/feature-branch */