fix merge conflict

comintern · comintern · commit a0a59f5c2ab2 · 2018-11-20T18:07:19.000-06:00
diff --git a/Rubberduck.VBEditor.VBA/SafeComWrappers/VB/CodePane.cs b/Rubberduck.VBEditor.VBA/SafeComWrappers/VB/CodePane.cs
@@ -141,5 +141,7 @@ public override int GetHashCode()
         {
             return IsWrappingNullReference ? 0 : Target.GetHashCode();
         }
+
+        protected override void Dispose(bool disposing) => base.Dispose(disposing);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -141,5 +141,7 @@ public override int GetHashCode()`
`141`	`141`	`{`
`142`	`142`	`return IsWrappingNullReference ? 0 : Target.GetHashCode();`
`143`	`143`	`}`
	`144`	`+`
	`145`	`+ protected override void Dispose(bool disposing) => base.Dispose(disposing);`
`144`	`146`	`}`
`145`	`147`	`}`