D10468.id.diff
No OneTemporary
Actions

Size

697 B

Referenced Files

None

Subscribers

None

D10468.id.diff
View Options

	diff --git a/src/lint/linter/ArcanistMergeConflictLinter.php b/src/lint/linter/ArcanistMergeConflictLinter.php
	--- a/src/lint/linter/ArcanistMergeConflictLinter.php
	+++ b/src/lint/linter/ArcanistMergeConflictLinter.php
	@@ -25,6 +25,12 @@
	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 @@
	}
	}

	- public function getLintNameMap() {
	- return array(
	- self::LINT_MERGECONFLICT => pht('Unresolved merge conflict'),
	- );
	- }
	-
	}