Merge branch 'master' of github.com:cls-02/TeraHz

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