fixed flaky test spring-projects/spring-data-couchbase#1264

Author: yyfMichaelYan

pr-data.csv

@@ -1902,7 +1902,11 @@ https://github.com/spring-projects/spring-data-couchbase,8c1a24c61934fff283a540f
 https://github.com/spring-projects/spring-data-couchbase,8c1a24c61934fff283a540fa830aa516db9a1059,.,org.springframework.data.couchbase.core.mapping.MappingCouchbaseConverterTests.idHasMultiplePrefixesAndSuffixesSameOrder,ID,,,
 https://github.com/spring-projects/spring-data-couchbase,8c1a24c61934fff283a540fa830aa516db9a1059,.,org.springframework.data.couchbase.core.mapping.MappingCouchbaseConverterTests.writesAndReadsClassContainingCustomConvertedObjects,ID,Opened,https://github.com/spring-projects/spring-data-couchbase/pull/1253,
 https://github.com/spring-projects/spring-data-couchbase,8c1a24c61934fff283a540fa830aa516db9a1059,.,org.springframework.data.couchbase.core.mapping.MappingCouchbaseConverterTests.writesAndReadsCustomConvertedClass,ID,Opened,https://github.com/spring-projects/spring-data-couchbase/pull/1241,
+<<<<<<< HEAD
 https://github.com/spring-projects/spring-data-couchbase,8c1a24c61934fff283a540fa830aa516db9a1059,.,org.springframework.data.couchbase.core.mapping.MappingCouchbaseConverterTests.writesAndReadsCustomFieldsConvertedClass,ID,Accepted,https://github.com/spring-projects/spring-data-couchbase/pull/1264,
+=======
+https://github.com/spring-projects/spring-data-couchbase,8c1a24c61934fff283a540fa830aa516db9a1059,.,org.springframework.data.couchbase.core.mapping.MappingCouchbaseConverterTests.writesAndReadsCustomFieldsConvertedClass,ID,Opened,https://github.com/spring-projects/spring-data-couchbase/pull/1264,
+>>>>>>> fixed flaky test https://github.com/spring-projects/spring-data-couchbase/pull/1264
 https://github.com/spring-projects/spring-data-envers,5637994be37747e82b2d6d5b34555e2bee791fe6,.,org.springframework.data.envers.repository.support.QueryDslRepositoryIntegrationTests.testWithQueryDsl,OD-Vic,,,
 https://github.com/spring-projects/spring-data-envers,5637994be37747e82b2d6d5b34555e2bee791fe6,.,org.springframework.data.envers.repository.support.QueryDslRepositoryIntegrationTests.testWithRevisions,OD-Vic,Accepted,https://github.com/spring-projects/spring-data-envers/pull/226,
 https://github.com/spring-projects/spring-data-rest,38f2bc4598265890e765a34d18962911916b7ace,spring-data-rest-webmvc,org.springframework.data.rest.webmvc.config.RepositoryRestMvConfigurationIntegrationTests.,ID,,,