diff cleanup

2026-04-29 02:41:12 +03:00 · 2026-03-25 15:43:36 -07:00
parent e53084273d
commit fdd3eaa93d
3 changed files with 1 additions and 14 deletions
--- a/codex-rs/analytics/src/analytics_client.rs
+++ b/codex-rs/analytics/src/analytics_client.rs
@@ -542,7 +542,6 @@ impl AnalyticsReducer {
            event.thread_id.clone(),
            ThreadState {
                _initialized_event: event.clone(),
->>>>>>> origin/rhan/oob-thread-metadata
            },
        );
        out.push(TrackEventRequest::ThreadInitialized(