From eb770f190436200f731e84c46b1f902c8b7decc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hozda?= Date: Mon, 13 Jan 2020 00:23:42 +0100 Subject: [PATCH] resolve conflict --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index ac8e33a..c84d08b 100644 --- a/README.md +++ b/README.md @@ -129,7 +129,7 @@ See also [Rust — Production](https://www.rust-lang.org/production) organizatio * [Servo](https://github.com/servo/servo) — A prototype web browser engine * [trust-dns](https://crates.io/crates/trust-dns) — A DNS-server [](https://travis-ci.org/bluejekyll/trust-dns) * [Weld](https://github.com/serayuzgur/weld) — Full fake REST API generator [](https://travis-ci.org/serayuzgur/weld) -* [kytan](https://github.com/changlan/kytan) - High Performance Peer-to-Peer VPN +* [kytan](https://github.com/changlan/kytan) - High Performance Peer-to-Peer VPN ### Audio @@ -168,7 +168,6 @@ See also [Rust — Production](https://www.rust-lang.org/production) organizatio * [indradb](https://crates.io/crates/indradb) — Rust based graph database [](https://travis-ci.org/indradb/indradb) * [noria](https://crates.io/crates/noria) — Dynamically changing, partially-stateful data-flow for web application backends [](https://travis-ci.org/mit-pdos/noria) * [ParityDB](https://github.com/paritytech/paritydb) — Fast and reliable database, optimised for read operation -[](https://travis-ci.org/paritytech/paritydb) * [PumpkinDB](https://github.com/PumpkinDB/PumpkinDB) — an event sourcing database engine [](https://travis-ci.org/PumpkinDB/PumpkinDB) * [seppo0010/rsedis](https://github.com/seppo0010/rsedis) — A Redis reimplementation in Rust [](https://travis-ci.org/seppo0010/rsedis) * [tikv](https://github.com/tikv/tikv) — A distributed KV database in Rust [](https://circleci.com/gh/tikv/tikv) @@ -196,7 +195,7 @@ See also [crates matching keyword 'emulator'](https://crates.io/keywords/emulato * Virtual Boy * [emu-rs/rustual-boy](https://github.com/emu-rs/rustual-boy) — [](https://travis-ci.org/emu-rs/rustual-boy) * Intel 8080 CPU - * [mohanson/i8080](https://github.com/mohanson/i8080) — Intel 8080 cpu emulator by Rust + * [mohanson/i8080](https://github.com/mohanson/i8080) — Intel 8080 cpu emulator by Rust * Emulator Development tools * SNES * [ioncodes/snesutilities](https://github.com/ioncodes/snesutilities) — ROM analyser/extractor @@ -725,6 +724,7 @@ See also [About Rust’s Machine Learning Community](https://medium.com/@autumn_ * [LukasKalbertodt/term-painter](https://github.com/LukasKalbertodt/term-painter) [[term-painter](https://crates.io/crates/term-painter)] — cross-platform styled terminal output [](https://travis-ci.org/LukasKalbertodt/term-painter) * [vitiral/termstyle](https://github.com/vitiral/termstyle) [[termstyle](https://docs.rs/termstyle/0.1.2/termstyle/)] — build (and test) formatted and styled command line applications * [SergioBenitez/yansi](https://github.com/SergioBenitez/yansi) [[yansi](https://crates.io/crates/yansi)] — A dead simple ANSI terminal color painting library + * [mackwic/colored](https://github.com/mackwic/colored)[[colored](https://crates.io/crates/colored)] — Coloring terminal so simple, you already know how to do it! * TUI * [TimonPost/crossterm](https://github.com/crossterm-rs/crossterm) [[crossterm](https://crates.io/crates/crossterm)] — crossplatform terminal library * [gyscos/Cursive](https://github.com/gyscos/Cursive) [[cursive](https://crates.io/crates/cursive)] — build rich TUI applications [](https://travis-ci.org/gyscos/Cursive) @@ -813,7 +813,7 @@ See also [About Rust’s Machine Learning Community](https://medium.com/@autumn_ * [conradkdotcom/rooster](https://github.com/conradkdotcom/rooster) [[rooster](https://crates.io/crates/rooster)] — Simple password manager to use in your terminal * [sfackler/rust-native-tls](https://github.com/sfackler/rust-native-tls) — Bindings for native TLS libraries * [sfackler/rust-openssl](https://github.com/sfackler/rust-openssl) — [OpenSSL](https://www.openssl.org/) bindings [](https://travis-ci.org/sfackler/rust-openssl) -* [kornelski/rust-security-framework](https://github.com/kornelski/rust-security-framework) — Bindings for Security Framework (OSX native +* [kornelski/rust-security-framework](https://github.com/kornelski/rust-security-framework) — Bindings for Security Framework (OSX native ) * [steffengy/schannel-rs](https://github.com/steffengy/schannel-rs) — Bindings for Schannel (Windows native TLS) @@ -968,7 +968,7 @@ See also [About Rust’s Machine Learning Community](https://medium.com/@autumn_ * JSON * [pikkr/pikkr](https://github.com/pikkr/pikkr) [[pikkr](https://crates.io/crates/pikkr)] — JSON parser which picks up values directly without performing tokenization in Rust * [serde-rs/json](https://github.com/serde-rs/json) [[serde\_json](https://crates.io/crates/serde_json)] — JSON support for [Serde](https://github.com/serde-rs/serde) framework [](https://travis-ci.org/serde-rs/json) - * [Licenser/simdjson-rs](https://github.com/simd-lite/simdjson-rs) [[simd-json](https://crates.io/crates/simd-json)] - High performance JSON parser based on a port of simdjson + * [Licenser/simdjson-rs](https://github.com/Licenser/simdjson-rs) [[simd-json](https://crates.io/crates/simd-json)] - High performance JSON parser based on a port of simdjson * [maciejhirsz/json-rust](https://github.com/maciejhirsz/json-rust) [[json](https://crates.io/crates/json)] — JSON implementation in Rust [](https://travis-ci.org/maciejhirsz/json-rust) * Jsonnet * [Qihoo360/rust-jsonnet](https://github.com/Qihoo360/rust-jsonnet) — [](https://travis-ci.org/Qihoo360/rust-jsonnet) @@ -1236,7 +1236,7 @@ See also [Are we game yet?](http://arewegameyet.com) * Cross-platform * [svartalf/rust-battery](https://crates.io/crates/battery) — Cross-platform information about the notebook batteries [](https://travis-ci.org/svartalf/rust-battery) - + * Linux * [frol/cgroups-fs](https://github.com/frol/cgroups-fs) — Rust bindings to Linux Control Groups (cgroups) [](https://travis-ci.org/frol/cgroups-fs) * [pop-os/dbus-udisks2](https://github.com/pop-os/dbus-udisks2) — UDisks2 DBus API