Merge branch 'master' of https://github.com/Particl-Community/academy

Particl-Community · Dec 8, 2022 · 60cf3ee · 60cf3ee
2 parents e8611bf + 560bbeb
commit 60cf3ee
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/basicswap-dex/basicswap_explained.rst b/basicswap-dex/basicswap_explained.rst
@@ -74,7 +74,11 @@ Compatible Coins
 
     BasicSwap's wallets page — WIP/Beta, UI/UX subject to change
 
+<<<<<<< HEAD
 BasicSwap already offers decentralized trading services for the following cryptocurrencies (`check it out on BasicSwap website <https://basicswapdex.com/markets>`_).
+=======
+BasicSwap already offers decentralized trading services for the following cryptocurrencies.
+>>>>>>> 560bbeba010032847556456bc28bbad05250e4d5
 
 +----------------------------------+---------------------------------------------+
 | **Coin Name**                    | **Ticker**                                  |
@@ -83,8 +87,11 @@ BasicSwap already offers decentralized trading services for the following crypto
 +----------------------------------+---------------------------------------------+
 | Monero                           | XMR                                         |
 +----------------------------------+---------------------------------------------+
+<<<<<<< HEAD
 | Dash                             | DASH                                        |
 +----------------------------------+---------------------------------------------+
+=======
+>>>>>>> 560bbeba010032847556456bc28bbad05250e4d5
 | Litecoin                         | LTC                                         |
 +----------------------------------+---------------------------------------------+
 | Firo                             | FIRO                                        |
@@ -93,6 +100,11 @@ BasicSwap already offers decentralized trading services for the following crypto
 +----------------------------------+---------------------------------------------+
 | Particl                          | PART                                        |
 +----------------------------------+---------------------------------------------+
+<<<<<<< HEAD
+=======
+| Namecoin                         | NMC                                         |
++----------------------------------+---------------------------------------------+
+>>>>>>> 560bbeba010032847556456bc28bbad05250e4d5
 
 We are looking at adding many other coins, including ETH and its ERC-20 tokens, following the release of the open beta. Any Bitcoin-based and Segwit-enabled :term:`cryptocurrency` can get integrated with minimal effort. Other token-issuing blockchains like Fantom, Solana, Avalanche, Polygon, or BSC may become available on BasicSwap at a later stage of the integration roadmap.
 
@@ -181,4 +193,4 @@ Gateways, each with pros and cons, may display things differently or provide a d
  - BasicSwap Guides - :doc:`Install and Get Started <../basicswap-guides/basicswapguides_installation>`
  - BasicSwap Guides - :doc:`How to Use <../basicswap-guides/basicswapguides_usage>` 
  - BasicSwap Guides - :doc:`Add or Remove a Coin <../basicswap-guides/basicswapguides_installation>`
- - BasicSwap Guides - :doc:`Apply for Coin Listing <../basicswap-guides/basicswapguides_apply>`  
+ - BasicSwap Guides - :doc:`Apply for Coin Listing <../basicswap-guides/basicswapguides_apply>`  
diff --git a/index.rst b/index.rst
@@ -172,17 +172,25 @@ Follow step-by-step user guides on how to use BasicSwap DEX and become an expert
    :maxdepth: 2
    :hidden:
 
+<<<<<<< HEAD
    basicswap-guides/basicswapguides_installation
    basicswap-guides/basicswapguides_update
+=======
+   basicswap-guides/basicswapguides_usage
+>>>>>>> 560bbeba010032847556456bc28bbad05250e4d5
    basicswap-guides/basicswapguides_addremovecoins
    basicswap-guides/basicswapguides_managecoins
    basicswap-guides/basicswapguides_tor
    basicswap-guides/basicswapguides_make
    basicswap-guides/basicswapguides_take
    basicswap-guides/basicswapguides_apply   
 
+<<<<<<< HEAD
 * :doc:`Get Started <basicswap-guides/basicswapguides_installation>`
 * :doc:`Get Started <basicswap-guides/basicswapguides_update>`
+=======
+* :doc:`How to Trade <basicswap-guides/basicswapguides_usage>`
+>>>>>>> 560bbeba010032847556456bc28bbad05250e4d5
 * :doc:`Add or Remove Coins <basicswap-guides/basicswapguides_addremovecoins>`
 * :doc:`Add or Remove Coins <basicswap-guides/basicswapguides_managecoins>`
 * :doc:`Connect to Tor <basicswap-guides/basicswapguides_tor>`
@@ -237,4 +245,4 @@ Resources and Links
 
 .. note::
 
-   This documentation is up-to-date with Particl's latest version, |PD version|. Please keep in mind this software is still in :guilabel:`BETA`, and as such, lots of features and improvements are regularly added.
+   This documentation is up-to-date with Particl's latest version, |PD version|. Please keep in mind this software is still in :guilabel:`BETA`, and as such, lots of features and improvements are regularly added.