Update operations.md

dunglas · web-flow · commit 13aeb735b90e · 2018-07-09T11:27:40.000+02:00
diff --git a/core/operations.md b/core/operations.md
@@ -710,7 +710,6 @@ There is another way to create a custom operation. However, we do not encourage
 the configuration at the same time in the routing and the resource configuration.
 
 First, let's create your resource configuration:
->>>>>>> 2.2
 
 ```php
 <?php
