mirror of
https://github.com/openai/codex.git
synced 2026-05-02 10:26:45 +00:00
diff cleanup
This commit is contained in:
@@ -542,7 +542,6 @@ impl AnalyticsReducer {
|
||||
event.thread_id.clone(),
|
||||
ThreadState {
|
||||
_initialized_event: event.clone(),
|
||||
>>>>>>> origin/rhan/oob-thread-metadata
|
||||
},
|
||||
);
|
||||
out.push(TrackEventRequest::ThreadInitialized(
|
||||
|
||||
@@ -6,14 +6,10 @@ pub use analytics_client::AnalyticsReducer;
|
||||
pub use analytics_client::AppInvocation;
|
||||
pub use analytics_client::AppMentionedInput;
|
||||
pub use analytics_client::AppUsedInput;
|
||||
<<<<<<< HEAD
|
||||
pub use analytics_client::CodexThreadInitializedEvent;
|
||||
pub use analytics_client::CodexTurnEvent;
|
||||
=======
|
||||
pub use analytics_client::CodexThreadContext;
|
||||
pub use analytics_client::CodexThreadInitializedEvent;
|
||||
pub use analytics_client::CodexThreadInitializedInput;
|
||||
>>>>>>> origin/rhan/oob-thread-metadata
|
||||
pub use analytics_client::CodexTurnEvent;
|
||||
pub use analytics_client::InitializationMode;
|
||||
pub use analytics_client::InvocationType;
|
||||
pub use analytics_client::PluginState;
|
||||
@@ -21,9 +17,5 @@ pub use analytics_client::PluginStateChangedInput;
|
||||
pub use analytics_client::PluginUsedInput;
|
||||
pub use analytics_client::SkillInvocation;
|
||||
pub use analytics_client::SkillInvokedInput;
|
||||
<<<<<<< HEAD
|
||||
pub use analytics_client::ThreadInitializedInput;
|
||||
=======
|
||||
>>>>>>> origin/rhan/oob-thread-metadata
|
||||
pub use analytics_client::TrackEventsContext;
|
||||
pub use analytics_client::build_track_events_context;
|
||||
|
||||
Reference in New Issue
Block a user