Skip to content

Commit

Permalink
Fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@bernardnormier
bernardnormier committed Jan 5, 2024
1 parent c2ab2fc commit f22c304
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions cpp/test/Slice/errorDetection/Reserved.err
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,3 @@ Reserved.ice:26: illegal identifier `Helper': `Helper' suffix is reserved
Reserved.ice:27: illegal identifier `abcHelper': `Helper' suffix is reserved
Reserved.ice:28: illegal identifier `Holder': `Holder' suffix is reserved
Reserved.ice:29: illegal identifier `abcHolder': `Holder' suffix is reserved
Reserved.ice:30: illegal identifier `Ice': `Ice' prefix is reserved
Reserved.ice:31: constant `ice' differs only in capitalization from constant `Ice'
Reserved.ice:32: illegal identifier `icea': `ice' prefix is reserved
Reserved.ice:33: illegal identifier `Iceblah': `Ice' prefix is reserved
Reserved.ice:34: illegal identifier `IceFoo': `Ice' prefix is reserved
Reserved.ice:35: illegal identifier `icecream': `ice' prefix is reserved
Reserved.ice:36: illegal identifier `ICEpick': `ICE' prefix is reserved
Reserved.ice:37: illegal identifier `iCEaxe': `iCE' prefix is reserved
Reserved.ice:40: illegal identifier `Ice': `Ice' prefix is reserved
Reserved.ice:41: illegal identifier `IceFoo': `Ice' prefix is reserved

0 comments on commit f22c304

Please sign in to comment.