Fixing a bad merge conflict

weaverryan · weaverryan · commit 2e7d5aa1eee8 · 2013-04-11T16:27:16.000-05:00
diff --git a/components/dependency_injection/parentservices.rst b/components/dependency_injection/parentservices.rst
@@ -312,26 +312,15 @@ to the ``NewsletterManager`` class, the config would look like this:
             mail_manager:
                 abstract:  true
                 calls:
-<<<<<<< HEAD
-                    - [ setMailer, [ @my_mailer ] ]
-                    - [ setEmailFormatter, [ @my_email_formatter] ]
-
-=======
                     - [setMailer, ["@my_mailer"]]
                     - [setEmailFormatter, ["@my_email_formatter"]]
-            
->>>>>>> e1ae126cb094754b7f4e72bbdb4388fed7f2d188
+
             newsletter_manager:
                 class:     "%newsletter_manager.class%"
                 parent: mail_manager
                 calls:
-<<<<<<< HEAD
-                    - [ setMailer, [ @my_alternative_mailer ] ]
-
-=======
                     - [setMailer, ["@my_alternative_mailer"]]
-            
->>>>>>> e1ae126cb094754b7f4e72bbdb4388fed7f2d188
+
             greeting_card_manager:
                 class:     "%greeting_card_manager.class%"
                 parent: mail_manager
@@ -450,24 +439,14 @@ If you had the following config:
             mail_manager:
                 abstract:  true
                 calls:
-<<<<<<< HEAD
-                    - [ setFilter, [ @my_filter ] ]
-
-=======
                     - [setFilter, ["@my_filter"]]
-                    
->>>>>>> e1ae126cb094754b7f4e72bbdb4388fed7f2d188
+
             newsletter_manager:
                 class:     "%newsletter_manager.class%"
                 parent: mail_manager
                 calls:
-<<<<<<< HEAD
-                    - [ setFilter, [ @another_filter ] ]
-
-=======
                     - [setFilter, ["@another_filter"]]
-            
->>>>>>> e1ae126cb094754b7f4e72bbdb4388fed7f2d188
+
     .. code-block:: xml
 
         <parameters>
