From 9fd0803eb04d929bb55b1c638b34e35989315d8a Mon Sep 17 00:00:00 2001
From: nulltoken <emeric.fermas@gmail.com>
Date: Sun, 2 Jun 2013 23:32:18 +0200
Subject: Remove obsolete members

---
 LibGit2Sharp/Repository.cs | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'LibGit2Sharp/Repository.cs')

diff --git a/LibGit2Sharp/Repository.cs b/LibGit2Sharp/Repository.cs
index 57cabb2e..5f7b7181 100644
--- a/LibGit2Sharp/Repository.cs
+++ b/LibGit2Sharp/Repository.cs
@@ -228,18 +228,6 @@ namespace LibGit2Sharp
             }
         }
 
-        /// <summary>
-        ///  Gets the conflicts that exist.
-        /// </summary>
-        [Obsolete("This property will be removed in the next release. Please use Index.Conflicts instead.")]
-        public ConflictCollection Conflicts
-        {
-            get
-            {
-                return Index.Conflicts;
-            }
-        }
-
         /// <summary>
         ///   Manipulate the currently ignored files.
         /// </summary>
-- 
cgit v1.2.3