From d2773d5fec428ff16d45404eceb21d6afc89dab6 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 20 Sep 2015 13:22:34 -0400 Subject: [PATCH] fix merge conflicts --- dashboard-ui/metadataadvanced.html | 33 ++++++- dashboard-ui/scripts/metadataadvanced.js | 117 ++++++++++++++++++++++- 2 files changed, 144 insertions(+), 6 deletions(-) diff --git a/dashboard-ui/metadataadvanced.html b/dashboard-ui/metadataadvanced.html index d09c3ccce1..ec0e4382b8 100644 --- a/dashboard-ui/metadataadvanced.html +++ b/dashboard-ui/metadataadvanced.html @@ -21,10 +21,12 @@