fix conflict

open-telemetry · Mar 27, 2024 · 9fbb3b8 · 9fbb3b8
1 parent 114b892
commit 9fbb3b8
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/docs/attributes-registry/db.md b/docs/attributes-registry/db.md
@@ -232,10 +232,3 @@
 | `db.elasticsearch.node.name` | string | Deprecated, use `db.instance.id` instead. | `instance-0000000001` | ![Deprecated](https://img.shields.io/badge/-deprecated-red)<br>Replaced by `db.instance.id`. |
 | `db.jdbc.driver_classname` | string | Removed, no replacement at this time. | `org.postgresql.Driver`; `com.microsoft.sqlserver.jdbc.SQLServerDriver` | ![Deprecated](https://img.shields.io/badge/-deprecated-red)<br>Removed as not used. |
 <!-- endsemconv -->
-=======
-| Attribute  | Type | Description  | Examples  | Stability |
-|---|---|---|---|---|
-| `db.connection_string` | string | Deprecated, use `server.address`, `server.port` attributes instead. | `Server=(localdb)\v11.0;Integrated Security=true;` | ![Deprecated](https://img.shields.io/badge/-deprecated-red)<br>"Replaced by `server.address` and `server.port`." |
-| `db.jdbc.driver_classname` | string | Removed, no replacement at this time. | `org.postgresql.Driver`; `com.microsoft.sqlserver.jdbc.SQLServerDriver` | ![Deprecated](https://img.shields.io/badge/-deprecated-red)<br>Removed as not used. |
-<!-- endsemconv -->
->>>>>>> 5f67589 (Set stability everywhere)