Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(38)

Unified Diff: CHANGELOG.md

Issue 2660333005: Change generic comment syntax to real generic syntax. (Closed)
Patch Set: Update version. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | lib/src/delegate/event_sink.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: CHANGELOG.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56855030b9910ff62cc15d424a9a3908cf01f604..be8377c16939e6c7fcdf5ca5fa77621d9de46a27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
## 1.13.0
+<<<<<<< ours
* Add `collectBytes` and `collectBytesCancelable` functions which collects
list-of-byte events into a single byte list.
@@ -8,6 +9,11 @@
* `StreamQueue.withTransaction()` now properly returns whether or not the
transaction was committed.
+=======
+* Add a `collectBytes` function which collects list-of-byte events into
+ a single byte list.
+* Switched to using generic method syntax.
+>>>>>>> theirs
## 1.12.0
« no previous file with comments | « no previous file | lib/src/delegate/event_sink.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698