resolved conflict

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1768 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/Misc/SharpDbTools/Project/SharpDbTools.csproj

@@ -21,7 +21,7 @@
     <IntermediateOutputPath>obj\Debug\</IntermediateOutputPath>
     <OutputPath>..\..\..\..\..\AddIns\AddIns\Misc\SharpDbTools\</OutputPath>
     <Optimize>False</Optimize>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>DEBUG%3bTRACE</DefineConstants>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>Full</DebugType>
     <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
@@ -70,9 +70,7 @@
     <EmbeddedResource Include="Src\GetConnectionLogicalNameDialog.resx">
       <DependentUpon>GetConnectionLogicalNameDialog.cs</DependentUpon>
     </EmbeddedResource>
-    <Compile Include="..\..\..\..\Main\GlobalAssemblyInfo.cs">
-      <Link>Configuration\GlobalAssemblyInfo.cs</Link>
-    </Compile>
+    <Compile Include="Src\Viewer\TableDescribeViewContent.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Src\Model" />