From 41a630c6ecda886bd62dc9786cec754edc7e34c2 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Sun, 26 Feb 2017 11:09:14 +0000
Subject: [PATCH] NotNull

---
 plugins/git4idea/src/git4idea/merge/GitMergeProvider.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git4idea/src/git4idea/merge/GitMergeProvider.java b/plugins/git4idea/src/git4idea/merge/GitMergeProvider.java
index ecc6fb3b709c..06d687397fed 100644
--- a/plugins/git4idea/src/git4idea/merge/GitMergeProvider.java
+++ b/plugins/git4idea/src/git4idea/merge/GitMergeProvider.java
@@ -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 {