Differential D9855 Diff 23650 src/lint/linter/ArcanistMergeConflictLinter.php

Changeset View

Standalone View

Show First 20 Lines • Show All 44 Lines • ▼ Show 20 Lines	public function lintPath($path) {
}		}
}		}

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

}		}