[tasque/viewmodel: 11/78] Resolve conflict

[Antonius Riha <antoniusri src gnome org>]

commit 249f27e0283c0402a0f8d5857778267c081ba458
Author: Antonius Riha <antoniusriha gmail com>
Date:   Thu Jul 26 00:59:14 2012 +0200

    Resolve conflict

 src/ObservableTransformCollections |    2 +-
 src/libtasqueui/libtasqueui.csproj |   23 +----------------------
 2 files changed, 2 insertions(+), 23 deletions(-)
---
diff --git a/src/ObservableTransformCollections b/src/ObservableTransformCollections
index 8e6c05f..a7bf241 160000
--- a/src/ObservableTransformCollections
+++ b/src/ObservableTransformCollections
@@ -1 +1 @@
-Subproject commit 8e6c05f058a95d48ba7ea381b7e1cac436a0e3de
+Subproject commit a7bf2411f73deee7e5374f48563b019ccb544c6f
diff --git a/src/libtasqueui/libtasqueui.csproj b/src/libtasqueui/libtasqueui.csproj
index 4c04656..d5cf8ae 100644
--- a/src/libtasqueui/libtasqueui.csproj
+++ b/src/libtasqueui/libtasqueui.csproj
@@ -138,13 +138,6 @@
     <Compile Include="..\..\build\GlobalDefines.cs">
       <Link>Properties\GlobalDefines.cs</Link>
     </Compile>
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-    <Compile Include="INativeApplication.cs" />
-    <Compile Include="NativeApplication.cs" />
-=======
-=======
->>>>>>> Stashed changes
     <Compile Include="NativeApplication.cs" />
     <Compile Include="Legacy\MainWindowModel.cs" />
     <Compile Include="Legacy\PreferencesDialogModel.cs" />
@@ -156,20 +149,10 @@
     <Compile Include="TaskGroupModelFactory.cs" />
     <Compile Include="Legacy\TrayModel.cs" />
     <Compile Include="Preferences.cs" />
-<<<<<<< Updated upstream
->>>>>>> Stashed changes
-=======
->>>>>>> Stashed changes
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <Folder Include="Properties\" />
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-    <Folder Include="Gtk2\" />
-=======
-=======
->>>>>>> Stashed changes
     <Folder Include="Legacy\" />
   </ItemGroup>
   <ItemGroup>
@@ -181,9 +164,5 @@
       <Project>{784C9AA8-2B28-400B-8CC4-DCDC48CA37F0}</Project>
       <Name>libtasque</Name>
     </ProjectReference>
-<<<<<<< Updated upstream
->>>>>>> Stashed changes
-=======
->>>>>>> Stashed changes
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>