fixup rebase gunk

notify-rs · Aug 17, 2022 · 17580f6 · 17580f6
1 parent 54465e9
commit 17580f6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/notify-debouncer-mini/Cargo.toml b/notify-debouncer-mini/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "notify-debouncer-mini"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 rust-version = "1.56"
 description = "notify mini debouncer for events"

diff --git a/notify-debouncer-mini/README.md b/notify-debouncer-mini/README.md
@@ -8,7 +8,6 @@ Tiny debouncer for [notify]. Filters incoming events and emits only one event pe
 
 - `crossbeam` enabled by default, for crossbeam channel support.  
 This may create problems used in tokio environments. See [#380](https://github.com/notify-rs/notify/issues/380).  
-<<<<<<< HEAD
 Use someting like the following to disable it.
 ```toml
 notify-debouncer-mini = { version = "*", default-features = false }