Merge branch 'main' into remove-with-record

open-telemetry · Mar 9, 2021 · e90e6f5 · e90e6f5
2 parents 86fe09d + 65c7de2
commit e90e6f5
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 0 deletions.
diff --git a/trace/trace_noop.go → trace/noop.go b/trace/trace_noop.go → trace/noop.go
diff --git a/trace/trace_noop_test.go → trace/noop_test.go b/trace/trace_noop_test.go → trace/noop_test.go