Revert "Adds another test for inner class accessibility"

This reverts commit 1a8190e.

Author: jeannielynnmoulton

jbmc/unit/java_bytecode/java_bytecode_parser/ContainsAnonymousClass$1.class

@@ -119,6 +119,7 @@ private PrivateDoublyNestedInnerClass(int i) {
     }
 }
 
+<<<<<<< HEAD
 class OuterClassMostRestrictiveDeeplyNested {
     public class SinglyNestedPublicClass {
         int i;
@@ -154,6 +155,8 @@ private PrivateDoublyNestedInnerClass(int i) {
 
 =======
 >>>>>>> parent of d5cb4f806... Adds another test for deeply nested classes.
+=======
+>>>>>>> parent of 1a8190e3b... Adds another test for inner class accessibility
 class ContainsAnonymousClass {
     interface InnerInterface {
         int i = 0;

jbmc/unit/java_bytecode/java_bytecode_parser/ContainsAnonymousClass$2.class

@@ -288,6 +288,7 @@ SCENARIO(
   }
 
   GIVEN(
+<<<<<<< HEAD
     "Some class files where the outer class is more restrictive than the first "
     "inner class")
   {
@@ -367,6 +368,8 @@ SCENARIO(
   GIVEN(
 =======
 >>>>>>> parent of d5cb4f806... Adds another test for deeply nested classes.
+=======
+>>>>>>> parent of 1a8190e3b... Adds another test for inner class accessibility
     "Some package-private class files in the class path with anonymous classes")
   {
     const symbol_tablet &new_symbol_table = load_java_class(