stash error

bdngeorge · Dec 4, 2021 · b355a91 · b355a91
1 parent 2a8855b
commit b355a91
Showing 1 changed file with 0 additions and 33 deletions.
diff --git a/styles/account.css b/styles/account.css
@@ -1,36 +1,4 @@
 html{
-<<<<<<< Updated upstream
-    background-image:url(accountsbackground.jpg) ; 
-
-
- }
- #outer {
-     position:absolute;
- left:250px;
- background-color: whitesmoke;
- width: 800px;
- border: 10px solid blueviolet; 
- padding: 20px; 
- height: 100px;
-
-
- }
- #middle{
-
- font-size: 2em;
- font-variant: small-caps;
- font-weight: bold;
- bottom: 200px;
- left: 650px;
-
-
-
- }
- #sellerlog{
-     font-size: 2em;
-    margin-left: 600px;
-    margin-top: -75px;
-=======
    background-image:url(accountsbackground.jpg) ; 
 
 
@@ -69,7 +37,6 @@ left: 650px;
 #welcome{
 
     text-align: center;
->>>>>>> Stashed changes