From 618129c519935d15427fb29d509dad4e58e0798c Mon Sep 17 00:00:00 2001 From: leon3s Date: Wed, 20 Dec 2023 13:40:54 +0100 Subject: [PATCH] fix: compil --- bin/nanocld/src/repositories/mod.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/bin/nanocld/src/repositories/mod.rs b/bin/nanocld/src/repositories/mod.rs index 9de4b06c2..cccee8158 100644 --- a/bin/nanocld/src/repositories/mod.rs +++ b/bin/nanocld/src/repositories/mod.rs @@ -10,10 +10,6 @@ mod vm_image; mod job; mod metric; mod http_metric; -<<<<<<< Updated upstream -======= -mod vm_spec; mod resource; ->>>>>>> Stashed changes pub mod generic;