solved merge conflicts
This commit is contained in:
commit
59f8677e7c
17 files changed
+261
-119
No files matched your search
@@ -1,7 +1,7 @@
|
||||
<%- include("./partials/fileHeader") %>
|
||||
<%- include("./partials/header") %>
|
||||
|
||||
<main>
|
||||
<main class="pt-26">
|
||||
<%- include("./partials/createAsset", { icons: icons }) %>
|
||||
|
||||
<% if (errMessage != "") { %>
|
||||
|
||||
Reference in new issue
Block a user