Fixed merge issues.

Author: Schmang13

__mocks__/styleMock.js

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 .chart {
   margin-top: 10px;
 }
@@ -34,40 +33,3 @@
   margin-right: 2px;
   background-color: rgba(19, 221, 29, 1);
 }
-=======
-.chart{
-    margin-top: 10px;
-}
-.chart-info{
-    width: 200px;
-    height: 110px;
-    margin-top: 10px;
-    margin-left: 15px;
-}
-.chart-label {
-    display: flex;
-    justify-content: space-evenly;
-    flex-direction: row;
-}
-.chart-label-container{
-    display: flex;
-    justify-content: space-between;
-    align-content: center;
-}
-.chart-label-text {
-    font-size: 11px;
-    font-weight: bold;
-}
-.cpuBox {
-    width: 15px;
-    height: 15px;
-    margin-right: 2px;
-    background-color: rgba(44, 130, 201, 1);
-}
-.memoryBox {
-    width: 15px;
-    height: 15px;
-    margin-right: 2px;
-    background-color: rgba(19, 221, 29, 1);
-}
->>>>>>> 276c4d7 (Revert "Updated linting for project. (#107)")

babel.config.json

@@ -1,11 +1,7 @@
 .fa-box-open {
   content: url(../../../assets/running.svg);
   width: 22px;
-<<<<<<< HEAD
   color: black;
-=======
-  color:black;
->>>>>>> 276c4d7 (Revert "Updated linting for project. (#107)")
 }
 
 .fa-archive {
@@ -49,12 +45,6 @@
 }
 
 .fa-log {
-<<<<<<< HEAD
   content: url(../../../assets/docketeer-logs.svg);
   width: 22px;
 }
-=======
-  content: url(../../../assets/docketeer_logs.svg);
-  width: 22px;
-}
->>>>>>> 276c4d7 (Revert "Updated linting for project. (#107)")

src/actions/actions.js

@@ -437,32 +437,6 @@ ul {
   display: none;
 }
 
-<<<<<<< HEAD:src/assets/css/styles.css
-=======
-.drag-container {
-  /* height: 30vh; */
-  /* margin: 20px; */
-  /* margin-top: 100px; */
-}
-
-.drag-container-box {
-  /* text-align: center; */
-  /* display: flex;
-  flex-direction: row;
-  align-items: flex-start;
-  min-width: 65vw; */
-  /* height: 30vh; */
-  /* margin-top: 30px; */
-  /* border-radius: 30px; */
-  /* padding: 30px;
-  background-color: white; */
-}
-
-/* .drag-container-box * {
-  margin-top: 20px;
-} */
-
->>>>>>> 276c4d7 (Revert "Updated linting for project. (#107)"):src/components/css/styles.css
 .btn-compose-up {
   display: flex;
   justify-content: space-between;
@@ -679,7 +653,6 @@ ul {
 
 .volume-container-details ul {
   margin-left: 1rem;
-<<<<<<< HEAD:src/assets/css/styles.css
 }
 
 /* Login Screen Form Added 10/21/22 */
@@ -699,6 +672,3 @@ ul {
   margin-left: 5;
   margin-bottom: 30;
 }
-=======
-}
->>>>>>> 276c4d7 (Revert "Updated linting for project. (#107)"):src/components/css/styles.css