From dec5b5d74067f03f39a7f7a6589d023d222415ce Mon Sep 17 00:00:00 2001
From: Nadya Zabrodina <Nadya.Zabrodina@jetbrains.com>
Date: Fri, 3 Oct 2014 18:20:39 +0400
Subject: [PATCH] annotation added

---
 .../src/org/zmlx/hg4idea/provider/update/HgConflictResolver.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgConflictResolver.java b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgConflictResolver.java
index f0bc186d9e2d..1a2a54038458 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgConflictResolver.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgConflictResolver.java
@@ -84,6 +84,7 @@ public final class HgConflictResolver {
     }, ModalityState.defaultModalityState());
   }
 
+  @NotNull
   public static List<VirtualFile> findConflicts(final Project project, VirtualFile repo) {
     Map<HgFile, HgResolveStatusEnum> resolves = new HgResolveCommand(project).getListSynchronously(repo);
     final List<VirtualFile> conflicts = new ArrayList<VirtualFile>();