Revert "Adds another test for deeply nested classes."

This reverts commit d5cb4f8.

Author: jeannielynnmoulton

jbmc/unit/java_bytecode/java_bytecode_parser/InnerClasses.java

@@ -85,6 +85,7 @@ private PrivateDoublyNestedInnerClass(int i) {
     }
 }
 
+<<<<<<< HEAD
 class InnerPrivateClassesDeeplyNested {
     private class SinglyNestedPrivateClass {
         int i;
@@ -151,6 +152,8 @@ private PrivateDoublyNestedInnerClass(int i) {
     }
 }
 
+=======
+>>>>>>> parent of d5cb4f806... Adds another test for deeply nested classes.
 class ContainsAnonymousClass {
     interface InnerInterface {
         int i = 0;

jbmc/unit/java_bytecode/java_bytecode_parser/parse_java_attributes.cpp

@@ -208,6 +208,7 @@ SCENARIO(
   }
 
   GIVEN(
+<<<<<<< HEAD
     "Some package-private class files in the class path with private deeply"
     "nested inner classes")
   {
@@ -364,6 +365,8 @@ SCENARIO(
   }
 
   GIVEN(
+=======
+>>>>>>> parent of d5cb4f806... Adds another test for deeply nested classes.
     "Some package-private class files in the class path with anonymous classes")
   {
     const symbol_tablet &new_symbol_table = load_java_class(