rebasing on main to resolve conflicts

gofractally · Sep 17, 2024 · c5b1293 · c5b1293
1 parent 9db59f5
commit c5b1293
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/services/user/CMakeLists.txt b/services/user/CMakeLists.txt
@@ -54,7 +54,6 @@ add("-debug")
 
 if(DEFINED IS_WASM)
     add_subdirectory(CommonApi)
-    add_subdirectory(Webmail)
     add_subdirectory(Events)
     add_subdirectory(Explorer)
     add_subdirectory(Fractal)

diff --git a/services/user/Webmail/Cargo.lock b/services/user/Webmail/Cargo.lock