fix bad conflict resolution

erizocosmico · erizocosmico · commit ea87958ea9b3 · 2018-07-03T12:30:27.000+02:00
Signed-off-by: Miguel Molina &lt;miguel@erizocosmi.co&gt;
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -1,10 +1,6 @@
 [[constraint]]
   name = "gopkg.in/src-d/go-mysql-server.v0"
-<<<<<<< HEAD
   revision = "dcc1c537eb7e2bc20ce69d03732e8aa8feaa8612"
-=======
-  revision = "4785fe821326846e344bb2a77c8bcc34d717096e"
->>>>>>> vendor: upgrade go-mysql-server
 
 [[constraint]]
   name = "github.com/jessevdk/go-flags"
diff --git a/docs/using-gitbase/functions.md b/docs/using-gitbase/functions.md
@@ -14,8 +14,4 @@ To make some common tasks easier for the user, there are some functions to inter
 
 ## Standard functions
 
-<<<<<<< HEAD
 You can check standard functions in [`go-mysql-server` documentation](https://github.com/src-d/go-mysql-server/tree/dcc1c537eb7e2bc20ce69d03732e8aa8feaa8612#custom-functions).
-=======
-You can check standard functions in [`go-mysql-server` documentation](https://github.com/src-d/go-mysql-server/tree/4785fe821326846e344bb2a77c8bcc34d717096e#custom-functions).
->>>>>>> vendor: upgrade go-mysql-server
