From cda773d47005443c9e2942d6c235bee460a65c31 Mon Sep 17 00:00:00 2001
From: LianaHus <liana@ethdev.com>
Date: Wed, 11 Sep 2019 14:35:21 +0200
Subject: [PATCH] Renamed - browser-files-tree.js to filePovider.js, -
 browser-files.js to localStorageProvider.js, - basicReadOnlyExplorer.js to
 readonlyProvider.js, - shared-folder.js to remixdProvider.js

standard

standard
---
 src/app/files/NotPersistedExplorer.js | 4 ++--
 src/app/files/fileProviderBase.js     | 4 +---
 src/app/tabs/compile-tab.js           | 8 ++++++++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/app/files/NotPersistedExplorer.js b/src/app/files/NotPersistedExplorer.js
index 6bf1ff1f3a..90f41a74f2 100644
--- a/src/app/files/NotPersistedExplorer.js
+++ b/src/app/files/NotPersistedExplorer.js
@@ -1,8 +1,8 @@
 'use strict'
-var ReadOnlyExplorer = require('./readonlyProvider')
+var ReadonlyProvider = require('./readonlyProvider')
 var toolTip = require('../ui/tooltip')
 
-class NotPersistedExplorer extends ReadOnlyExplorer {
+class NotPersistedExplorer extends ReadonlyProvider {
   constructor (type) {
     super(type)
     this.readonly = false
diff --git a/src/app/files/fileProviderBase.js b/src/app/files/fileProviderBase.js
index acd59fefa4..9d6e942dc4 100644
--- a/src/app/files/fileProviderBase.js
+++ b/src/app/files/fileProviderBase.js
@@ -9,7 +9,6 @@ this.set = function (path, content, cb) {}
 
 this.addReadOnly = function (path, content) {}
 
-
 this.isReadOnly = function (path) {}
 
 this.remove = function (path) {}
@@ -20,6 +19,5 @@ this.resolveDirectory = function (path, callback) {}
 
 this.removePrefix = function (path) {}
 
-  
 updateRefs (path, type) {}
-*/
\ No newline at end of file
+*/
diff --git a/src/app/tabs/compile-tab.js b/src/app/tabs/compile-tab.js
index 49c94c2006..19bbb49b11 100644
--- a/src/app/tabs/compile-tab.js
+++ b/src/app/tabs/compile-tab.js
@@ -234,7 +234,15 @@ class CompileTab extends ViewPlugin {
       </div>
         
       <article class="${css.compilerArticle}">
+<<<<<<< HEAD
         <button class="btn btn-secondary btn-block" title="Publish on Swarm" onclick="${() => { this.publish('swarm') }}">
+=======
+        <button class="btn btn-secondary btn-block" title="Publish on Swarm" onclick="${() => { this.publish() }}">
+<<<<<<< HEAD
+=======
+          <i class="${css.copyIcon} fas fa-upload" aria-hidden="true"></i>
+>>>>>>> c353b990... standard
+>>>>>>> c049685c... standard
           <span>Publish on Swarm</span>
           <img id="swarmLogo" class="${css.storageLogo} ml-2" src="${swarmImg}">
         </button>