styling 5

2019-10-06 17:03:45 +02:00
parent c049d5e8df
commit 766d9b09e6
1 changed files with 1 additions and 5 deletions
--- a/frontend/frontend.js
+++ b/frontend/frontend.js
@@ -48,11 +48,7 @@ function graphSpectralData (obj, dom) {
      responsive: false,
      legend: {
        labels: {
-<<<<<<< HEAD
-          fontColor: '#ffffff'
-=======
-          fontcolor: '#ffffff'
->>>>>>> e21efc1b4a57fb153e2bbc832e44354dd9aa5d31
+          fontColor: '#fff'
        }
      }
    }