diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2015-06-01 15:18:50 +0300 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2015-06-01 15:18:50 +0300 |
| commit | d82e74a8e47780ec4731799483d872f8a6e26083 (patch) | |
| tree | 4fbd626422813843cc69e08f484699b655b0d4d3 /main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml | |
| parent | a556244492effa4631e8d49f4086c14a536bb94e (diff) | |
| parent | 82e8055ed3911bcab828dd93b6f1848f53e72239 (diff) | |
Merge branch 'master' into roslyn
Conflicts:
main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ReferenceManager.cs
main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/BaseGitRepositoryTests.cs
main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/BaseRepositoryTests.cs
version-checks
Diffstat (limited to 'main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml')
| -rw-r--r-- | main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml b/main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml index de0621993d..1fa0aeec0c 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml @@ -178,7 +178,7 @@ description = "Add items to version control ignore list"/> <Command id = "MonoDevelop.VersionControl.Commands.Unignore" _label = "Remove from ignore list" - description = "Add items to version control ignore list"/> + description = "Removes items to version control ignore list"/> <Command id = "MonoDevelop.VersionControl.Commands.ResolveConflicts" _label = "Resolve Conflicts" description = "Resolve conflicts on the project file."/> |