fix rebase

next-hat · Jan 31, 2024 · 2375d13 · 2375d13
1 parent f93b87c
commit 2375d13
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 30 deletions.
diff --git a/bin/nanocld/migrations/2024-01-05-113424_process_statuses/down.sql b/bin/nanocld/migrations/2024-01-05-113424_process_statuses/down.sql
diff --git a/bin/nanocld/migrations/2024-01-05-113424_process_statuses/up.sql b/bin/nanocld/migrations/2024-01-05-113424_process_statuses/up.sql
diff --git a/bin/nanocld/src/models/mod.rs b/bin/nanocld/src/models/mod.rs
@@ -51,16 +51,11 @@ pub use event::*;
 mod raw_emitter;
 pub use raw_emitter::*;
 
-<<<<<<< Updated upstream
 mod task_manager;
 pub use task_manager::*;
 
 mod object_process_status;
 pub use object_process_status::*;
-=======
-mod process_status;
-pub use process_status::*;
->>>>>>> Stashed changes
 
 pub type Pool = Arc<R2D2Pool<ConnectionManager<PgConnection>>>;
 pub type DBConn = PooledConnection<ConnectionManager<PgConnection>>;

diff --git a/bin/nanocld/src/schema.rs b/bin/nanocld/src/schema.rs
@@ -81,7 +81,6 @@ diesel::table! {
 }
 
 diesel::table! {
-<<<<<<< Updated upstream
     object_process_statuses (key) {
         key -> Varchar,
         created_at -> Timestamptz,
@@ -90,15 +89,6 @@ diesel::table! {
         prev_wanted -> Varchar,
         actual -> Varchar,
         prev_actual -> Varchar,
-=======
-    process_statuses (key) {
-        key -> Varchar,
-        updated_at -> Timestamptz,
-        created_at -> Timestamptz,
-        current -> Varchar,
-        previous -> Varchar,
-        wanted -> Varchar,
->>>>>>> Stashed changes
     }
 }
 
@@ -199,11 +189,7 @@ diesel::allow_tables_to_appear_in_same_query!(
   node_group_links,
   node_groups,
   nodes,
-<<<<<<< Updated upstream
   object_process_statuses,
-=======
-  process_statuses,
->>>>>>> Stashed changes
   processes,
   resource_kinds,
   resources,