All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 027cb928 authored by Leigh B Stoller's avatar Leigh B Stoller

Fix merge error.

parent e53e73ad
...@@ -914,7 +914,6 @@ function (_, Constraints, sup, ppstart, JacksEditor, wt, ...@@ -914,7 +914,6 @@ function (_, Constraints, sup, ppstart, JacksEditor, wt,
sitenum++; sitenum++;
}); });
} }
>>>>>>> Reformulate instantiate page into a template. Rework the step container
//console.info(html); //console.info(html);
$("#cluster_selector").html(html); $("#cluster_selector").html(html);
$("#cluster_selector").removeClass("hidden"); $("#cluster_selector").removeClass("hidden");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment