remove note

Signed-off-by: Little-Wallace <bupt2013211450@gmail.com>

remove note
Signed-off-by: Little-Wallace <bupt2013211450@gmail.com>
7cbc18c2 · Little-Wallace · e965e428 · 7cbc18c2
Commit 7cbc18c2 authored Nov 08, 2019 by Little-Wallace
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

lib.rs librocksdb_sys/src/lib.rs +0 -3

No files found.
--- a/librocksdb_sys/src/lib.rs
+++ b/librocksdb_sys/src/lib.rs
@@ -18,9 +18,6 @@ extern crate libc;
 #[cfg(test)]
 extern crate tempdir;
-//<<<<<<< HEAD
-//use libc::{c_char, c_double, c_int, c_uchar, c_void, size_t, uint32_t, uint64_t, uint8_t};
-//=======
 use libc::{
    c_char, c_double, c_int, c_uchar, c_void, size_t,
 };