revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-12-23 05:50:54 +01:00
Code Issues Releases Wiki Activity

Minor reordering of functions

Browse source 
Summary: This seems somewhat neater to me, YMMV.

Test Plan: N/A

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: epriestley, Korvin

Differential Revision: https://secure.phabricator.com/D10468
This commit is contained in:
Joshua Spence 2014-09-22 18:42:41 +10:00
parent be34693f23
commit 670dccee47
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/lint/linter/ArcanistMergeConflictLinter.php
View file

@ -25,6 +25,12 @@ final class ArcanistMergeConflictLinter extends ArcanistLinter {
return 'merge-conflict';
}
public function getLintNameMap() {
return array(
self::LINT_MERGECONFLICT => pht('Unresolved merge conflict'),
);
}
public function lintPath($path) {
$lines = phutil_split_lines($this->getData($path), false);
@ -41,10 +47,4 @@ final class ArcanistMergeConflictLinter extends ArcanistLinter {
}
}
public function getLintNameMap() {
return array(
self::LINT_MERGECONFLICT => pht('Unresolved merge conflict'),
);
}
}