fixed merge artifacts

Author: retailcoder

RubberduckCodeAnalysis/Resources.cs.Designer.cs

@@ -147,7 +147,12 @@
     <Compile Include="ChainedWrapperAnalyzer.cs" />
     <Compile Include="ComVisibleTypeAnalyzer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Resources.Designer.cs">
+    <Compile Include="Resources.cs.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.cs.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Resources1.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
@@ -164,5 +169,16 @@
     <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.2.6.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
     <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.2.6.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources.cs.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.cs.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources1.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

RubberduckCodeAnalysis/Resources.Designer.cs renamed to RubberduckCodeAnalysis/Resources1.Designer.cs

@@ -171,14 +171,14 @@
       <Project>{ac1b4a57-364a-4f90-a0cd-6ee818349ce5}</Project>
       <Name>Rubberduck.API</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Rubberduck.CodeAnalysis\Rubberduck.CodeAnalysis.csproj">
+      <Project>{def2fb9d-6e62-49d6-8e26-9983ac025768}</Project>
+      <Name>Rubberduck.CodeAnalysis</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Rubberduck.Core\Rubberduck.Core.csproj">
       <Project>{a1587eac-7b54-407e-853f-4c7493d0323e}</Project>
       <Name>Rubberduck.Core</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Rubberduck.Inspections\Rubberduck.Inspections.csproj">
-      <Project>{ac4f1d22-d74b-45ff-ab0c-cc2a104fe023}</Project>
-      <Name>Rubberduck.Inspections</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Rubberduck.Interaction\Rubberduck.Interaction.csproj">
       <Project>{ac54b7fb-170d-4da6-a30b-8cad182f0e6b}</Project>
       <Name>Rubberduck.Interaction</Name>