Merge branch 'master' into async-iterators

alubbe · alubbe · commit 9d972a9efb98 · 2020-06-02T20:14:05.000+02:00
diff --git a/README.md b/README.md
@@ -74,6 +74,14 @@ npm install exceljs
     Merged <a href="https://github.com/exceljs/exceljs/pull/1215">docs: add links to top with jump2header #1215</a>.
     Many thanks to <a href="https://github.com/strdr4605">Dragoș Străinu</a> for this contribution.
   </li>
+  <li>
+    Merged <a href="https://github.com/exceljs/exceljs/pull/1310">Fix cell.text return an empty object when cell is empty #1310</a>.
+    Many thanks to <a href="https://github.com/Alanscut">Alan Wang</a> for this contribution.
+  </li>
+  <li>
+    Merged <a href="https://github.com/exceljs/exceljs/pull/1303">Use rest args instead of slicing arguments #1303</a>.
+    Many thanks to <a href="https://github.com/alubbe">Andreas Lubbe</a> for this contribution.
+  </li>
 </ul>
 
 
@@ -2346,7 +2354,6 @@ await workbook.commit();
 // ... the stream has been written
 ```
 
-<<<<<<< HEAD
 ##### Streaming XLSX Reader
 
 The streaming XLSX workbook reader is available in the ExcelJS.stream.xlsx namespace.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "exceljs",
-  "version": "3.9.0",
+  "version": "3.10.0",
   "description": "Excel Workbook Manager - Read and Write xlsx and csv Files.",
   "private": false,
   "license": "MIT",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "exceljs",`
`3`		`- "version": "3.9.0",`
	`3`	`+ "version": "3.10.0",`
`4`	`4`	`"description": "Excel Workbook Manager - Read and Write xlsx and csv Files.",`
`5`	`5`	`"private": false,`
`6`	`6`	`"license": "MIT",`