removed double implementation

6 years ago · 8445cd98e3
parent 6284fb8b32
commit 8445cd98e3
1 changed files with 3 additions and 0 deletions
--- a/src/app/ui/tooltip.js
+++ b/src/app/ui/tooltip.js
@ -25,6 +25,7 @@ class Toaster {
  }
  render (tooltipText, actionElement, opts) {
    opts = defaultOptions(opts)
+<<<<<<< HEAD
 <<<<<<< HEAD
    let canShorten = true
    if (tooltipText instanceof Element) {
@ -42,6 +43,8 @@ class Toaster {
    if (typeof (tooltipText) === 'object' && tooltipText.message !== undefined) {
      tooltipText = tooltipText.message
    }
+=======
+>>>>>>> 9211c21f... removed double implementation

    if (typeof tooltipText === 'object') {
      if (tooltipText.message) {