fix conflicts

syl20b · syl20b · commit ee7d69da29ee · 2023-07-31T14:05:02.000+02:00
diff --git a/UPGRADE-6.4.md b/UPGRADE-6.4.md
@@ -1,6 +1,11 @@
 UPGRADE FROM 6.3 to 6.4
 =======================
 
+BrowserKit
+----------
+
+* Methods `AbstractBrowser::click()` and `AbstractBrowser::clickLink()` will have a new $serverParameters argument in version 6.4, not defining it is deprecated
+
 Cache
 -----
 
diff --git a/src/Symfony/Component/BrowserKit/CHANGELOG.md b/src/Symfony/Component/BrowserKit/CHANGELOG.md
@@ -4,8 +4,7 @@ CHANGELOG
 6.4
 ---
 
-* Methods `AbstractBrowser::click()` and `AbstractBrowser::clickLink()` will have a new `$serverParameters` argument
-  in version 6.4, not defining it is deprecated
+* Added `$serverParameters` argument to `AbstractBrowser::click()` and `AbstractBrowser::clickLink()` methods
 
 6.3
 ---
