diff options
| author | David Karlaš <david.karlas@microsoft.com> | 2018-02-27 21:15:04 +0300 |
|---|---|---|
| committer | David Karlaš <david.karlas@microsoft.com> | 2018-02-27 21:27:11 +0300 |
| commit | 3ad3d2c39e7ac26d6943bead34185063fa508d6b (patch) | |
| tree | 050efa7202789387cb6e568ad60d96f38de5eef1 /main/src | |
| parent | ba7091918ed939889a1892fcac4dfa4725fc5b4a (diff) | |
Fix wrong conflict resolution
Diffstat (limited to 'main/src')
| -rw-r--r-- | main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj index 32883ae442..31ce9d4e2e 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj @@ -291,6 +291,7 @@ <Compile Include="MonoDevelop.SourceEditor\TextMarker\LineSeparatorMarker.cs" /> <Compile Include="MonoDevelop.SourceEditor.QuickTasks\QuickTaskOverviewMode.IndicatorDrawingCache.cs" /> <Compile Include="MonoDevelop.SourceEditor.QuickTasks\QuickTaskOverviewMode.IdleUpdater.cs" /> + <Compile Include="MonoDevelop.SourceEditor\SourceEditorView.IMonoDevelopEditorOperations.cs" /> <Compile Include="VSEditor\ConnectionManager.cs" /> <Compile Include="VSEditor\IMdTextView.cs" /> <Compile Include="VSEditor\ITagBasedSyntaxHighlightingFactory.cs" /> @@ -301,10 +302,6 @@ <Compile Include="VSEditor\TextSelection.cs" /> <Compile Include="VSEditor\TextViewRoleSet.cs" /> <Compile Include="VSEditor\VacuousTextDataModel.cs" /> - <None Include="packages.config" /> - <Compile Include="MonoDevelop.SourceEditor\TextMarker\LineSeparatorMarker.cs" /> - <Compile Include="MonoDevelop.SourceEditor.QuickTasks\QuickTaskOverviewMode.IndicatorDrawingCache.cs" /> - <Compile Include="MonoDevelop.SourceEditor.QuickTasks\QuickTaskOverviewMode.IdleUpdater.cs" /> <Compile Include="MonoDevelop.SourceEditor\TextEditorKeyPressTimings.cs" /> <Compile Include="VSEditor\FakeWpf\Geometry.cs" /> <Compile Include="VSEditor\FakeWpf\Mouse.cs" /> @@ -360,7 +357,6 @@ <Compile Include="VSEditor\Text\Impl\WpfView\SpaceReservationStack.cs" /> <Compile Include="VSEditor\Text\Util\TextDataUtil\MappingHelper.cs" /> <Compile Include="VSEditor\VisualStudio\Impl\ViewAdapter\TipManager.cs" /> - <Compile Include="MonoDevelop.SourceEditor\SourceEditorView.IMonoDevelopEditorOperations.cs" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="gtk-gui\gui.stetic"> |