Merge pull request cockroachdb#2837 from cockroachdb/fix-merge-confli…

…ct-markers

Remove git merge conflict markers

_includes/sql/v2.0/diagrams/experimental_audit.html

@@ -1,9 +1,4 @@
 <div><svg width="566" height="146">
-<<<<<<< HEAD
-
-=======
-
->>>>>>> c12511b0... partition_by sql railroad diagrams
          <polygon points="9 17 1 13 1 21"></polygon>
          <polygon points="17 17 9 13 9 21"></polygon>
          <rect x="31" y="3" width="62" height="32" rx="10"></rect>
@@ -35,8 +30,4 @@
          <path class="line" d="m17 17 h2 m0 0 h10 m62 0 h10 m0 0 h10 m62 0 h10 m0 0 h10 m90 0 h10 m0 0 h10 m176 0 h10 m0 0 h10 m44 0 h10 m2 0 l2 0 m2 0 l2 0 m2 0 l2 0 m-230 66 l2 0 m2 0 l2 0 m2 0 l2 0 m22 0 h10 m56 0 h10 m0 0 h10 m64 0 h10 m-180 0 h20 m160 0 h20 m-200 0 q10 0 10 10 m180 0 q0 -10 10 -10 m-190 10 v24 m180 0 v-24 m-180 24 q0 10 10 10 m160 0 q10 0 10 -10 m-170 10 h10 m46 0 h10 m0 0 h94 m23 -44 h-3"></path>
          <polygon points="557 83 565 79 565 87"></polygon>
          <polygon points="557 83 549 79 549 87"></polygon>
-<<<<<<< HEAD
       </svg></div>
-=======
-      </svg></div>
->>>>>>> c12511b0... partition_by sql railroad diagrams

v2.0/experimental-audit.md

@@ -4,7 +4,7 @@ summary: Use the EXPERIMENTAL_AUDIT subcommand to turn SQL audit logging on or o
 toc: false
 ---
 
-`EXPERIMENTAL_AUDIT` is a subcommand of [`ALTER TABLE`](alter-table.html) that is used to turn SQL audit logging on or off for a table.
+`EXPERIMENTAL_AUDIT` is a subcommand of [`ALTER TABLE`](alter-table.html) that is used to turn [SQL audit logging](sql-audit-logging.html) on or off for a table.
 
 The audit logs contain detailed information about queries being executed against your system, including: