diff options
| author | nulltoken <emeric.fermas@gmail.com> | 2013-06-03 01:32:18 +0400 |
|---|---|---|
| committer | nulltoken <emeric.fermas@gmail.com> | 2013-06-03 01:33:30 +0400 |
| commit | 9fd0803eb04d929bb55b1c638b34e35989315d8a (patch) | |
| tree | d81b0d768b20d4105072a46e89edb27edd9f965e /LibGit2Sharp/Repository.cs | |
| parent | f2e2fac618f0b656379fa32c967dcdb0dc2742dd (diff) | |
Remove obsolete members
Diffstat (limited to 'LibGit2Sharp/Repository.cs')
| -rw-r--r-- | LibGit2Sharp/Repository.cs | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/LibGit2Sharp/Repository.cs b/LibGit2Sharp/Repository.cs index 57cabb2e..5f7b7181 100644 --- a/LibGit2Sharp/Repository.cs +++ b/LibGit2Sharp/Repository.cs @@ -229,18 +229,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> public Ignore Ignore |