MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

NotNull

Browse Source
This commit is contained in:
Kirill Likhodedov
2017-02-26 11:09:40 +00:00
parent d4f00a3df8
commit 41a630c6ec
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/merge/GitMergeProvider.java
+1 -1
View File
@@ -498,7 +498,7 @@ public class GitMergeProvider implements MergeProvider2 {
}
@Override
public void conflictResolvedForFile(VirtualFile file, @NotNull Resolution resolution) {
public void conflictResolvedForFile(@NotNull VirtualFile file, @NotNull Resolution resolution) {
Conflict c = myConflicts.get(file);
assert c != null : "Conflict was not loaded for the file: " + file.getPath();
try {