Fix merge errors that made main and development no longer in sync #32
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* GitBook: No commit message * MMM Sus * GITBOOK-1: No subject * GITBOOK-2: Specify to run all 3 lines at once * Update configuration.md I got the moderation config options done..... adding more l8r Signed-off-by: Zino <98627207+Zinoviya99@users.noreply.github.com> * GITBOOK-13: Add Fedora guide * Update configuration.md Added appearance configs Signed-off-by: Zino <98627207+Zinoviya99@users.noreply.github.com> * Update configuration.md Take 2 fixed what seb pointed out Signed-off-by: Zino <98627207+Zinoviya99@users.noreply.github.com> * Update configuration.md Signed-off-by: Zino <98627207+Zinoviya99@users.noreply.github.com> * Update configuration.md Signed-off-by: Zino <98627207+Zinoviya99@users.noreply.github.com> * Update configuration.md Removed Quick Nav For now Signed-off-by: Zino <98627207+Zinoviya99@users.noreply.github.com> * Finished Config Page If anything is wrong wait 5 - 7 business days before telling me /s. Added everything, its all done, is pretty, is all configs. I just need to add the quick nav, which I will get to at a later point. Signed-off-by: Zino <98627207+Zinoviya99@users.noreply.github.com> * Add base logviewer instructions * Add a patreon logviewer hosting setup * Added info on how to clone a private repo * Added logviewer links to summary * Fix links * Fix patreon underscore * Fix another underscore * Apply stephen's suggestions * Change extra line in premium logviewer guide * Fix for stephen's review * Fix small oversight * Fix some additional formatting * GITBOOK-14: Add Alma Linux guide * GITBOOK-15: Minor tweaks and correction * GITBOOK-16: Update links * GITBOOK-17: Move auto-restart guide to its own page * GITBOOK-18: Add pm2 auto-restart * GITBOOK-19: Add community guide description * Self-hosting correction and enhancement (#26) * GITBOOK-21: Fix Ubuntu guide to account for multiple python version, add FAQ page * GITBOOK-22: Specify python version, move updating guide to its own page, various minor edits * GITBOOK-23: Remove version from pip command in favor of --default-pip * GITBOOK-24: Fix a few install commands * GITBOOK-25: Add pm2 reference * GITBOOK-26: No subject * GITBOOK-28: Fix Windows guide commands * GITBOOK-29: Update Ubuntu guide * GITBOOK-30: Update Debian & Fedora guide * GITBOOK-31: Update Alma Linux guide --------- Signed-off-by: Zino <98627207+Zinoviya99@users.noreply.github.com> Signed-off-by: Sebastian Kuipers <61157793+sebkuip@users.noreply.github.com> Signed-off-by: Raiden <raidensakurajima@gmail.com> Co-authored-by: Raiden <shoukaku@sleepingknights.moe> Co-authored-by: Raiden <raidensakurajima@gmail.com> Co-authored-by: Raiden <raiden@project-mei.xyz> Co-authored-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com> Co-authored-by: Sebastian Kuipers <61157793+sebkuip@users.noreply.github.com> Co-authored-by: sebkuip <kuipers.sebastian@ziggo.nl>
* GitBook: No commit message * MMM Sus * GITBOOK-1: No subject * GITBOOK-2: Specify to run all 3 lines at once * Update configuration.md I got the moderation config options done..... adding more l8r Signed-off-by: Zino <98627207+Zinoviya99@users.noreply.github.com> * GITBOOK-13: Add Fedora guide * Update configuration.md Added appearance configs Signed-off-by: Zino <98627207+Zinoviya99@users.noreply.github.com> * Update configuration.md Take 2 fixed what seb pointed out Signed-off-by: Zino <98627207+Zinoviya99@users.noreply.github.com> * Update configuration.md Signed-off-by: Zino <98627207+Zinoviya99@users.noreply.github.com> * Update configuration.md Signed-off-by: Zino <98627207+Zinoviya99@users.noreply.github.com> * Update configuration.md Removed Quick Nav For now Signed-off-by: Zino <98627207+Zinoviya99@users.noreply.github.com> * Finished Config Page If anything is wrong wait 5 - 7 business days before telling me /s. Added everything, its all done, is pretty, is all configs. I just need to add the quick nav, which I will get to at a later point. Signed-off-by: Zino <98627207+Zinoviya99@users.noreply.github.com> * Add base logviewer instructions * Add a patreon logviewer hosting setup * Added info on how to clone a private repo * Added logviewer links to summary * Fix links * Fix patreon underscore * Fix another underscore * Apply stephen's suggestions * Change extra line in premium logviewer guide * Fix for stephen's review * Fix small oversight * Fix some additional formatting * GITBOOK-14: Add Alma Linux guide * GITBOOK-15: Minor tweaks and correction * GITBOOK-16: Update links * GITBOOK-17: Move auto-restart guide to its own page * GITBOOK-18: Add pm2 auto-restart * GITBOOK-19: Add community guide description * Self-hosting correction and enhancement (#26) * GITBOOK-21: Fix Ubuntu guide to account for multiple python version, add FAQ page * GITBOOK-22: Specify python version, move updating guide to its own page, various minor edits * GITBOOK-23: Remove version from pip command in favor of --default-pip * GITBOOK-24: Fix a few install commands * GITBOOK-25: Add pm2 reference * GITBOOK-26: No subject * GITBOOK-28: Fix Windows guide commands * GITBOOK-29: Update Ubuntu guide * GITBOOK-30: Update Debian & Fedora guide * GITBOOK-31: Update Alma Linux guide * Small correction (#27) Signed-off-by: Raiden <raidensakurajima@gmail.com> * Update windows.md (#29) Signed-off-by: Stephen <48072084+StephenDaDev@users.noreply.github.com> --------- Signed-off-by: Zino <98627207+Zinoviya99@users.noreply.github.com> Signed-off-by: Sebastian Kuipers <61157793+sebkuip@users.noreply.github.com> Signed-off-by: Raiden <raidensakurajima@gmail.com> Signed-off-by: Stephen <48072084+StephenDaDev@users.noreply.github.com> Co-authored-by: Raiden <shoukaku@sleepingknights.moe> Co-authored-by: Raiden <raidensakurajima@gmail.com> Co-authored-by: Zino <98627207+Zinoviya99@users.noreply.github.com> Co-authored-by: Raiden <raiden@project-mei.xyz> Co-authored-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com> Co-authored-by: Sebastian Kuipers <61157793+sebkuip@users.noreply.github.com> Co-authored-by: sebkuip <kuipers.sebastian@ziggo.nl>
* Update macos.md I basically stole the template from Ubuntu installation page and modified some dependencies as I find it mostly the same process except to install some extra libs. I've tested using my own Mac and it was running perfectly. Let me know the parts to fix, if any. Signed-off-by: Jahseh J. <139241743+JahsehJ@users.noreply.github.com> * Correct for PR change requests * Correct typos & missing info --------- Signed-off-by: Jahseh J. <139241743+JahsehJ@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ye its all my fault I merged that thing to main and forgot this would happen