Merge pull request ava-labs#90 from BourgondAries/master

Fix added in merge conflict

Author: kanatliemre

README.md

@@ -27,13 +27,8 @@ When you go to the website on your browser, you might get a warning saying
 
 ## Deployment
 
-<<<<<<< HEAD
-
 1.  Compile and minify to have a production ready application with `yarn build`.
-2.  # Serve from the `/dist` directory.
-
-1)  Compile and minify to have a production ready application with `yarn build`.
-2)  Serve from the `/dist` directory.
+2.  Serve from the `/dist` directory.
 
 ## Releases
 
@@ -45,21 +40,12 @@ When you go to the website on your browser, you might get a warning saying
 
 By default the wallet will connect to the Avalanche test network. You can change to another network by clicking the button labeled `TestNet` on the navigation bar and selecting another network, or add a custom network.
 
-> > > > > > > dev
-
-## Changing the Network
-
-<<<<<<< HEAD
-By default the wallet will connect to the Avalanche test network. You can change to another network by clicking the button labeled `TestNet` on the navigation bar and selecting another network, or add a custom network.
-
 ## Explorer API
 
 # The wallet uses the Avalanche Explorer API to display wallet transaction history.
 
 The wallet uses the Avalanche Explorer API to display wallet transaction history.
 
-> > > > > > > dev
-
 WARNING: This history might be out of order and incomplete.
 
 ## Browser Support
@@ -68,12 +54,7 @@ We suggest using Google Chrome to view the Avalanche Wallet website.
 
 ### Firefox and https
 
-<<<<<<< HEAD
 Firefox does not allow https requests to localhost. But the Avalanche Wallet uses https by default, so we will need to change this to http. Make this switch by editing the `vue.config.js` file in the root directory and change
-=======
-Firefox does not allow https requests to localhost. But the Avalanche Wallet uses https by default, so we will need to change this to http. Make this switch by editing the `vue.config.js` file in the root directory and change
-
-> > > > > > > dev
 
 ```
 devServer: {