Skip to content

Commit 28849b6

Browse files
authored
Exclude isConflict from isPR (#9)
1 parent 88eeae2 commit 28849b6

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

index.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,11 @@ collect.set('isProject', [
154154
'https://github.com/sindresorhus/refined-github/projects/3',
155155
]);
156156

157-
export const isPR = (url: URL | Location = location): boolean => /^pull\/\d+/.test(getRepoPath(url)!);
157+
export const isPR = (url: URL | Location = location): boolean => /^pull\/\d+/.test(getRepoPath(url)!) && !isPRConflicts(url);
158158
collect.set('isPR', [
159159
'https://github.com/sindresorhus/refined-github/pull/148',
160160
'https://github.com/sindresorhus/refined-github/pull/148/commits',
161161
'https://github.com/sindresorhus/refined-github/pull/148/files',
162-
'https://github.com/sindresorhus/refined-github/pull/148/conflicts',
163162
'https://github.com/sindresorhus/refined-github/pull/148/commits/00196',
164163
'https://github.com/sindresorhus/refined-github/pull/148/commits/0019603b83bd97c2f7ef240969f49e6126c5ec85',
165164
]);

0 commit comments

Comments
 (0)