pascaldevink
diff --git a/‎cookbook/form/dynamic_form_modification.rst‎
Lines changed: 0 additions & 7 deletions b/‎cookbook/form/dynamic_form_modification.rst‎
Lines changed: 0 additions & 7 deletions
@@ -433,13 +433,6 @@ class, you can simply call::
  }
  }
 
-<<<<<<< HEAD
-=======
-If you extend the ``Symfony\Bundle\FrameworkBundle\Controller\Controller`` class, you can simply call::
-
- $form = $this->createForm(FriendMessageFormType::class);
-
->>>>>>> pull/5834
 You can also easily embed the form type into another form::
 
  // inside some other "form type" class
Original file line number	Diff line number	Diff line change
`@@ -433,13 +433,6 @@ class, you can simply call::`
`433`	`433`	`}`
`434`	`434`	`}`
`435`	`435`
`436`		`-<<<<<<< HEAD`
`437`		`-=======`
`438`		-If you extend the ``Symfony\Bundle\FrameworkBundle\Controller\Controller`` class, you can simply call::
`439`		`-`
`440`		`- $form = $this->createForm(FriendMessageFormType::class);`
`441`		`-`
`442`		`->>>>>>> pull/5834`
`443`	`436`	`You can also easily embed the form type into another form::`
`444`	`437`
`445`	`438`	`// inside some other "form type" class`