Fix merge conflict between #2906 and #2881 (#2910) · 401880a14b - carbon-lang - Gitea: Git with a cup of tea

carbon-language/carbon-lang

mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 22:02:55 +01:00

Fix merge conflict between #2906 and #2881 (#2910)

This commit is contained in:

josh11b

2023-06-15 09:42:41 -07:00

committed by

GitHub

parent da647f579a

commit 401880a14b

1 changed files with 2 additions and 1 deletions

explorer/testdata/class/conversion.carbon

Vendored

+2 -1

View File

@@ -30,7 +30,8 @@ base class B {
   var b: i32;
 }
 class C extends B {
 class C {
   extend base: B;
   var c: i32;
 }