diff --git a/README.md b/README.md index 7a2d80fd..91d24e9d 100644 --- a/README.md +++ b/README.md @@ -1,59 +1,7 @@ -<<<<<<< HEAD -# Tuwunel 🎔 -======= # continuwuity - ->>>>>>> e054a56b (docs: New readme) - -![GitHub Repo stars](https://img.shields.io/github/stars/matrix-construct/tuwunel?style=flat&color=%23fcba03&link=https%3A%2F%2Fgithub.com%2Fmatrix-construct%2Ftuwunel) ![GitHub commit activity](https://img.shields.io/github/commit-activity/m/matrix-construct/tuwunel?style=flat&color=%2303fcb1&link=https%3A%2F%2Fgithub.com%2Fmatrix-construct%2Ftuwunel%2Fpulse%2Fmonthly) ![GitHub Created At](https://img.shields.io/github/created-at/matrix-construct/tuwunel) ![GitHub License](https://img.shields.io/github/license/matrix-construct/tuwunel) - -<<<<<<< HEAD -## High Performance [Matrix](https://matrix.org/) Chat Homeserver in Rust! - - - - - -### Status - -Tuwunel is a successor to conduwuit. We are currently in the process of transitioning. -The software is just as great as before. Please bear with us. - -### Goals - -**Maximum Performance.** Tuwunel relentlessly pursues optimization, embracing hardware -acceleration with the highest throughput and lowest latency for messages. - -**Unlimited Features.** Tuwunel is working toward a fully modular design to leverage -the widest number of contributor features. Our goal is to never have to say no to your ideas. - -#### Can I migrate or switch from Conduwuit? - -Yes. - -#### Can I migrate or switch from Conduit? - -No. - -#### Can I migrate from Synapse? - -No, but this is planned. - -## Tuwunel 🎔 -======= ## A community-driven [Matrix](https://matrix.org/) homeserver in Rust @@ -122,10 +70,7 @@ We're working our way through all of the issues in the [Forgejo project](https:/ - Dendrite: No - Synapse: No -Although you can't migrate your data from other homeservers, it is perfectly acceptable to set up continuwuity on the same domain as a previous homeserver. ->>>>>>> e054a56b (docs: New readme) - -Tuwunel's theme is **empathy in communication** defined by the works of [Edith Stein](https://plato.stanford.edu/entries/stein/). +We haven't written up a guide on migrating from incompatible homeservers yet. Reach out to us if you need to do this! @@ -158,14 +103,12 @@ When incorporating code from other forks: -<<<<<<< HEAD -======= #### Contact ->>>>>>> e054a56b (docs: New readme) [continuwuity]: https://forgejo.ellis.link/continuwuation/continuwuity +