Removing merge conflict marker.

This commit is contained in:
Goldie Gadde 2019-08-06 13:51:02 -07:00
parent 118ac87006
commit 6e5da334f1

View File

@ -561,7 +561,6 @@ This release contains contributions from many people at Google, as well as:
## Bug Fixes and Other Changes
<<<<<<< HEAD
* Documentation
* Update the doc with the details about the rounding mode used in
quantize_and_dequantize_v2.