Fixing bad merge conflict (forgot to save!)

weaverryan · weaverryan · commit 236797ee23ce · 2015-03-14T14:41:34.000-04:00
diff --git a/book/propel.rst b/book/propel.rst
@@ -241,15 +241,11 @@ have a route that maps a product id to an update action in a controller::
                 );
             }
 
-<<<<<<< HEAD
             $product->setName('New product name!');
             $product->save();
 
-            return $this->redirect($this->generateUrl('homepage'));
+            return $this->redirectToRoute('homepage');
         }
-=======
-        return $this->redirectToRoute('homepage');
->>>>>>> pull/5046
     }
 
 Updating an object involves just three steps:

Original file line number	Diff line number	Diff line change
`@@ -241,15 +241,11 @@ have a route that maps a product id to an update action in a controller::`
`241`	`241`	`);`
`242`	`242`	`}`
`243`	`243`
`244`		`-<<<<<<< HEAD`
`245`	`244`	`$product->setName('New product name!');`
`246`	`245`	`$product->save();`
`247`	`246`
`248`		`- return $this->redirect($this->generateUrl('homepage'));`
	`247`	`+ return $this->redirectToRoute('homepage');`
`249`	`248`	`}`
`250`		`-=======`
`251`		`- return $this->redirectToRoute('homepage');`
`252`		`->>>>>>> pull/5046`
`253`	`249`	`}`
`254`	`250`
`255`	`251`	`Updating an object involves just three steps:`