Skip to content

Commit ad103fa

Browse files
committed
minor #14723 Remove merge conflict header (GawainLynch)
This PR was submitted for the 5.x branch but it was merged into the 5.2 branch instead. Discussion ---------- Remove merge conflict header Spotted this on the Sphinx fail from my last PR Commits ------- 63a4e50 Remove merge conflict header
2 parents dc29127 + 63a4e50 commit ad103fa

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

notifier.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ integration with these chat services:
139139

140140
========== ================================ ===========================================================================
141141
Service Package DSN
142-
<<<<<<< HEAD
143142
========== ================================ ===========================================================================
144143
Discord ``symfony/discord-notifier`` ``discord://TOKEN@default?webhook_id=ID``
145144
GoogleChat ``symfony/google-chat-notifier`` ``googlechat://ACCESS_KEY:ACCESS_TOKEN@default/SPACE?threadKey=THREAD_KEY``

0 commit comments

Comments
 (0)