Skip to content

Commit 5b2c2ed

Browse files
Revert "Adds another test for inner class accessibility"
This reverts commit 1a8190e.
1 parent 5f81f5b commit 5b2c2ed

15 files changed

+6
-0
lines changed
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

jbmc/unit/java_bytecode/java_bytecode_parser/InnerClasses.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ private PrivateDoublyNestedInnerClass(int i) {
119119
}
120120
}
121121

122+
<<<<<<< HEAD
122123
class OuterClassMostRestrictiveDeeplyNested {
123124
public class SinglyNestedPublicClass {
124125
int i;
@@ -154,6 +155,8 @@ private PrivateDoublyNestedInnerClass(int i) {
154155

155156
=======
156157
>>>>>>> parent of d5cb4f806... Adds another test for deeply nested classes.
158+
=======
159+
>>>>>>> parent of 1a8190e3b... Adds another test for inner class accessibility
157160
class ContainsAnonymousClass {
158161
interface InnerInterface {
159162
int i = 0;
-691 Bytes
Binary file not shown.
-691 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)