Revert "format"

This reverts commit a1e726e.
TestingResearchIllinois · Nov 19, 2024 · 7b664fc · 7b664fc
1 parent 83999ad
commit 7b664fc
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/pr-data.csv b/pr-data.csv
@@ -683,7 +683,11 @@ https://github.com/alibaba/fastjson,e05e9c5e4be580691cc55a59f3256595393203a1,.,c
 https://github.com/alibaba/fastjson,e05e9c5e4be580691cc55a59f3256595393203a1,.,com.alibaba.json.bvt.issue_1200.Issue1298.test_for_issue_1,OD,Accepted,https://github.com/alibaba/fastjson/pull/2148,RepoArchived
 https://github.com/alibaba/fastjson,e05e9c5e4be580691cc55a59f3256595393203a1,.,com.alibaba.json.bvt.issue_1300.Issue1363.test_for_issue,ID,Opened,https://github.com/alibaba/fastjson/pull/3522,https://github.com/TestingResearchIllinois/idoft/issues/3;RepoArchived
 https://github.com/alibaba/fastjson,e05e9c5e4be580691cc55a59f3256595393203a1,.,com.alibaba.json.bvt.issue_1300.Issue1363.test_for_issue_1,ID,Opened,https://github.com/alibaba/fastjson/pull/3522,https://github.com/TestingResearchIllinois/idoft/issues/3;RepoArchived
+<<<<<<< HEAD
 https://github.com/alibaba/fastjson,93d8c01e907fe35a8ff0eb5fe1c3b279d2f30282,.,com.alibaba.json.bvt.issue_1300.Issue1368.test_for_issue,ID,DeveloperFixed,,https://github.com/alibaba/fastjson/commit/f33474b4c618ee86cde67d5f589e447409183837;RepoArchived
+=======
+https://github.com/alibaba/fastjson,93d8c01e907fe35a8ff0eb5fe1c3b279d2f30282,.,com.alibaba.json.bvt.issue_1300.Issue1368.test_for_issue,ID,DeveloperFixed,https://github.com/alibaba/fastjson/commit/f33474b4c618ee86cde67d5f589e447409183837,RepoArchived
+>>>>>>> parent of a1e726e (format)
 https://github.com/alibaba/fastjson,e05e9c5e4be580691cc55a59f3256595393203a1,.,com.alibaba.json.bvt.issue_1400.Issue1480.test_for_issue,ID,Accepted,https://github.com/alibaba/fastjson/pull/3025,RepoArchived
 https://github.com/alibaba/fastjson,3ea25de368b185e3c9f3d56e46a4cfcdb9265318,.,com.alibaba.json.bvt.issue_1400.Issue1492.test_for_issue,ID,Opened,https://github.com/alibaba/fastjson/pull/3571,RepoArchived
 https://github.com/alibaba/fastjson,e05e9c5e4be580691cc55a59f3256595393203a1,.,com.alibaba.json.bvt.issue_1500.Issue1584.test_for_issue,ID,Accepted,https://github.com/alibaba/fastjson/pull/3570,RepoArchived
@@ -873,6 +877,10 @@ https://github.com/alibaba/nacos,f136dde8fae27797156f0ecb9abbe80774beaea4,config
 https://github.com/alibaba/nacos,f136dde8fae27797156f0ecb9abbe80774beaea4,config,com.alibaba.nacos.config.server.utils.MD5UtilTest.testCompareMd5,OD-Vic,,,
 https://github.com/alibaba/nacos,f136dde8fae27797156f0ecb9abbe80774beaea4,config,com.alibaba.nacos.config.server.utils.PropertyUtilTest.testGetPropertyV1,OD-Vic,,,
 https://github.com/alibaba/nacos,f136dde8fae27797156f0ecb9abbe80774beaea4,config,com.alibaba.nacos.config.server.utils.PropertyUtilTest.testGetPropertyV2,OD-Vic,,,
+<<<<<<< HEAD
+=======
+
+>>>>>>> parent of a1e726e (format)
 https://github.com/alibaba/Sentinel,0a34fc4d11392f0587e7ba5bf2626f902b23c750,sentinel-adapter/sentinel-jax-rs-adapter,com.alibaba.csp.sentinel.adapter.jaxrs.ClientFilterTest.testClientFallback,OD-Vic,Opened,https://github.com/alibaba/Sentinel/pull/3272,https://github.com/alibaba/Sentinel/issues/3271
 https://github.com/alibaba/Sentinel,0a34fc4d11392f0587e7ba5bf2626f902b23c750,sentinel-adapter/sentinel-jax-rs-adapter,com.alibaba.csp.sentinel.adapter.jaxrs.ProviderFilterTest.testCustomRequestOriginParser,OD-Vic,Opened,https://github.com/alibaba/Sentinel/pull/3272,https://github.com/alibaba/Sentinel/issues/3271
 https://github.com/alibaba/Sentinel,0a34fc4d11392f0587e7ba5bf2626f902b23c750,sentinel-adapter/sentinel-jax-rs-adapter,com.alibaba.csp.sentinel.adapter.jaxrs.ProviderFilterTest.testDefaultFallback,OD-Vic,Opened,https://github.com/alibaba/Sentinel/pull/3272,https://github.com/alibaba/Sentinel/issues/3271