[fractal/backend: 8/9] Update cargo.lock

[Daniel Garcia Moreno <danigm src gnome org>]

commit 8e8d53fe0256b152e25f0d467c2f6499612429d9
Author: Daniel García Moreno <dani danigm net>
Date:   Sun Jan 20 12:10:34 2019 +0100

    Update cargo.lock

 Cargo.lock | 30 ++++--------------------------
 1 file changed, 4 insertions(+), 26 deletions(-)
---
diff --git a/Cargo.lock b/Cargo.lock
index d9743b21..4e3853c2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -465,19 +465,11 @@ name = "fractal-backend"
 version = "0.1.0"
 dependencies = [
  "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< HEAD
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "fractal-matrix-api 4.0.0",
  "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rusqlite 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
- "failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "fractal-matrix-api 4.0.0",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rusqlite 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Thread local singleton for the connection
+ "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1166,7 +1158,7 @@ dependencies = [
 
 [[package]]
 name = "libsqlite3-sys"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index";
 dependencies = [
  "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2032,13 +2024,9 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index";
 dependencies = [
  "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "libsqlite3-sys 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libsqlite3-sys 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< HEAD
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
- "time 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Thread local singleton for the connection
 ]
 
 [[package]]
@@ -2779,14 +2767,9 @@ dependencies = [
 "checksum libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)" = 
"48450664a984b25d5b479554c29cc04e3150c97aa4c01da5604a2d4ed9151476"
 "checksum libdbus-sys 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = 
"18cb88963258d00f4962205dbb5933d82780d9962c8c8a064b651d2ad7189210"
 "checksum libflate 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)" = 
"bff3ac7d6f23730d3b533c35ed75eef638167634476a499feef16c428d74b57b"
-<<<<<<< HEAD
 "checksum libhandy 0.1.0 (git+https://gitlab.gnome.org/jsparber/libhandy-rs)" = "<none>"
 "checksum libhandy-sys 0.1.0 (git+https://gitlab.gnome.org/jsparber/libhandy-rs)" = "<none>"
-"checksum libsqlite3-sys 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = 
"742b695cbfb89e549dca6960a55e6802f67d352e33e97859ee46dee835211b0f"
-=======
-"checksum libhandy 0.2.0 (git+https://gitlab.gnome.org/jsparber/libhandy-rs)" = "<none>"
-"checksum libsqlite3-sys 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = 
"6864266fa0d613f5382997f6152280edeccfd46173285459b627d6319526f5c9"
->>>>>>> Thread local singleton for the connection
+"checksum libsqlite3-sys 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = 
"3567bc1a0c84e2c0d71eeb4a1f08451babf7843babd733158777d9c686dad9f3"
 "checksum linked-hash-map 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = 
"7860ec297f7008ff7a1e3382d7f7e1dcd69efc94751a2284bafc3d013c2aa939"
 "checksum linkify 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = 
"9ce9439c6f4a1092dc1861272bef01034891da39f13aa1cdcf40ca3e4081de5f"
 "checksum lmdb 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = 
"5b0908efb5d6496aa977d96f91413da2635a902e5e31dbef0bfb88986c248539"
@@ -2877,13 +2860,8 @@ dependencies = [
 "checksum regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = 
"7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7"
 "checksum regex-syntax 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = 
"4e47a2ed29da7a9e1960e1639e7a982e6edc6d49be308a3b02daf511504a16d1"
 "checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = 
"3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5"
-<<<<<<< HEAD
 "checksum reqwest 0.9.8 (registry+https://github.com/rust-lang/crates.io-index)" = 
"0e60f169af3915c294818d55dde549f00d2966cef36d6c5e7255d75df3f2b16f"
-"checksum rusqlite 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = 
"39bae767eb27866f5c0be918635ae54af705bc09db11be2c43a3c6b361cf3462"
-=======
-"checksum reqwest 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)" = 
"ab52e462d1e15891441aeefadff68bdea005174328ce3da0a314f2ad313ec837"
 "checksum rusqlite 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = 
"6381ddfe91dbb659b4b132168da15985bc84162378cf4fcdc4eb99c857d063e2"
->>>>>>> Thread local singleton for the connection
 "checksum rust-crypto 0.2.36 
(git+https://github.com/awmath/rust-crypto?rev=394c247254dbe2ac5d44483232cf335d10cf0260)" = "<none>"
 "checksum rust-gmp 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = 
"4cd7d57377b309a73f69e164109203aa9ab3fee6ea68ac5fb76e2edb50662e9b"
 "checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = 
"adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619"