Chromium Code Reviews| 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 |