Files F14406452

D10477.id25190.diff
No OneTemporary
Actions

Size

448 B

Referenced Files

None

Subscribers

None

D10477.id25190.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,10 +25,6 @@
	return 'merge-conflict';
	}

	- public function willLintPaths(array $paths) {
	- return;
	- }
	-
	public function lintPath($path) {
	$lines = phutil_split_lines($this->getData($path), false);

File Metadata

Mime Type: text/plain
Expires: Tue, Dec 24, 2:17 PM (18 h, 18 m)
Storage Engine: blob
Storage Format: Encrypted (AES-256-CBC)
Storage Handle: 6923712
Default Alt Text: D10477.id25190.diff (448 B)

Event Timeline