fix doc

apache · Jul 6, 2020 · 60ac2a0 · 60ac2a0
1 parent 3bd8d23
commit 60ac2a0
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/docs/_data/menu-sql.yaml b/docs/_data/menu-sql.yaml
@@ -207,13 +207,9 @@
                 - text: CLEAR CACHE
                   url: sql-ref-syntax-aux-cache-clear-cache.html
                 - text: REFRESH TABLE
-<<<<<<< HEAD
-                  url: sql-ref-syntax-aux-refresh-table.html
-                - text: REFRESH FUNCTION
-                  url: sql-ref-syntax-aux-refresh-function.html
-=======
                   url: sql-ref-syntax-aux-cache-refresh-table.html
->>>>>>> 492d5d174a435c624bd87af9ee3621f4f1c8d1c5
+                - text: REFRESH FUNCTION
+                  url: sql-ref-syntax-aux-cache-refresh-function.html
                 - text: REFRESH
                   url: sql-ref-syntax-aux-cache-refresh.html
             - text: DESCRIBE