more cleanup

BZngr · BZngr · commit 7866984caafd · 2017-03-01T20:39:24.000-08:00
diff --git a/RetailCoder.VBE/Inspections/AssignedByValParameterInspection.cs b/RetailCoder.VBE/Inspections/AssignedByValParameterInspection.cs
@@ -11,12 +11,8 @@ namespace Rubberduck.Inspections
 {
     public sealed class AssignedByValParameterInspection : InspectionBase
     {
-//<<<<<<< HEAD
         private readonly IAssignedByValParameterQuickFixDialogFactory _dialogFactory;
         private RubberduckParserState _parserState;
-//=======
-        //private readonly IAssignedByValParameterQuickFixDialogFactory _dialogFactory;
-//>>>>>>> rubberduck-vba/next
         public AssignedByValParameterInspection(RubberduckParserState state, IAssignedByValParameterQuickFixDialogFactory dialogFactory)
             : base(state)
         {
diff --git a/RubberduckTests/Inspections/AssignedByValParameterMakeLocalCopyQuickFixTests.cs b/RubberduckTests/Inspections/AssignedByValParameterMakeLocalCopyQuickFixTests.cs
@@ -238,7 +238,7 @@ End Sub
             KeyValuePair<string, string>[] standardModules = { };
             KeyValuePair<string, string>[] classModules = { firstClass };
 
-            //Not changes to the code module if any of these invalid names are chosen
+            //No changes to the code module if any of these invalid names are chosen
             string[] invalidNames = { "memberLong", "memberString", "FooFight", "Foo" };
             foreach (var invalidName in invalidNames)
             {

Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,8 @@ namespace Rubberduck.Inspections`
`11`	`11`	`{`
`12`	`12`	`public sealed class AssignedByValParameterInspection : InspectionBase`
`13`	`13`	`{`
`14`		`-//<<<<<<< HEAD`
`15`	`14`	`private readonly IAssignedByValParameterQuickFixDialogFactory _dialogFactory;`
`16`	`15`	`private RubberduckParserState _parserState;`
`17`		`-//=======`
`18`		`- //private readonly IAssignedByValParameterQuickFixDialogFactory _dialogFactory;`
`19`		`-//>>>>>>> rubberduck-vba/next`
`20`	`16`	`public AssignedByValParameterInspection(RubberduckParserState state, IAssignedByValParameterQuickFixDialogFactory dialogFactory)`
`21`	`17`	`: base(state)`
`22`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ End Sub`
`238`	`238`	`KeyValuePair<string, string>[] standardModules = { };`
`239`	`239`	`KeyValuePair<string, string>[] classModules = { firstClass };`
`240`	`240`
`241`		`- //Not changes to the code module if any of these invalid names are chosen`
	`241`	`+ //No changes to the code module if any of these invalid names are chosen`
`242`	`242`	`string[] invalidNames = { "memberLong", "memberString", "FooFight", "Foo" };`
`243`	`243`	`foreach (var invalidName in invalidNames)`
`244`	`244`	`{`