File tree Expand file tree Collapse file tree 1 file changed +1
-2
lines changed
Expand file tree Collapse file tree 1 file changed +1
-2
lines changed Original file line number Diff line number Diff 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 => / ^ p u l l \/ \d + / . test ( getRepoPath ( url ) ! ) ;
157+ export const isPR = ( url : URL | Location = location ) : boolean => / ^ p u l l \/ \d + / . test ( getRepoPath ( url ) ! ) && ! isPRConflicts ( url ) ;
158158collect . 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] ) ;
You can’t perform that action at this time.
0 commit comments