mirror of
https://github.com/dart-lang/sdk
synced 2024-11-02 12:24:24 +00:00
Fix bad merge in spec.
Change-Id: I4a8fc32071804c5edd0f7aab905ea4402df4414d Reviewed-on: https://dart-review.googlesource.com/60102 Reviewed-by: Erik Ernst <eernst@google.com> Commit-Queue: Lasse R.H. Nielsen <lrn@google.com>
This commit is contained in:
parent
37425618d5
commit
5dced20b93
1 changed files with 0 additions and 3 deletions
|
@ -47,7 +47,6 @@
|
|||
% local function evaluates to the closurization of that declaration.
|
||||
% - Make `mixin` and `interface` built-in identifiers.
|
||||
% - Make `async` *not* a reserved word inside async functions.
|
||||
<<<<<<< HEAD
|
||||
% - Add 'Class Member Conflicts', simplifying and adjusting rules about
|
||||
% member declaration conflicts beyond "`n` declared twice in one scope".
|
||||
% - Specify that integer literals are limited to signed 64-bit values,
|
||||
|
@ -56,9 +55,7 @@
|
|||
% - Specify variance and super-bounded types.
|
||||
% - Introduce `subterm` and `immediate subterm`.
|
||||
% - Introduce `top type`.
|
||||
=======
|
||||
% - Specify configurable imports.
|
||||
>>>>>>> Update changelog.
|
||||
%
|
||||
% 1.15
|
||||
% - Change how language specification describes control flow.
|
||||
|
|
Loading…
Reference in a new issue