From 5dced20b93e96ec6dfa621a0935658fa386ead64 Mon Sep 17 00:00:00 2001 From: "Lasse R.H. Nielsen" Date: Wed, 13 Jun 2018 13:32:00 +0000 Subject: [PATCH] Fix bad merge in spec. Change-Id: I4a8fc32071804c5edd0f7aab905ea4402df4414d Reviewed-on: https://dart-review.googlesource.com/60102 Reviewed-by: Erik Ernst Commit-Queue: Lasse R.H. Nielsen --- docs/language/dartLangSpec.tex | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/language/dartLangSpec.tex b/docs/language/dartLangSpec.tex index d48dbdce624..f06888f7908 100644 --- a/docs/language/dartLangSpec.tex +++ b/docs/language/dartLangSpec.tex @@ -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.