boxdot / gurk-rs

Signal Messenger client for terminal
GNU Affero General Public License v3.0
458 stars 33 forks source link

Replace log4rs with tracing #160

Closed mucinoab closed 2 years ago

mucinoab commented 2 years ago

Fixes #158

boxdot commented 2 years ago

Thank you!

mucinoab commented 2 years ago

I am not quite sure what to do about the conflicts... 😞

boxdot commented 2 years ago

I am not quite sure what to do about the conflicts... 😞

You can just check out Cargo.lock from the master branch in your branch, and then run e.g. cargo check again. It will generate a new fitting Cargo.lock.

boxdot commented 2 years ago

@mucinoab I merged the master and resolved the conflicts. Also removed a dbg statement. Ready to merge!