UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit 7734b068 authored by luke.glasscock's avatar luke.glasscock
Browse files

Resolve merge conflicts

parent def51719
No related branches found
No related tags found
No related merge requests found
......@@ -250,20 +250,12 @@ const routes = [
},
},
{
<<<<<<< HEAD
path: "/residency",
=======
path: "/products/residency",
>>>>>>> master
name: "Residency",
component: () =>
import(/* webpackChunkName: "CNAP" */ "@/views/Residency.vue"),
meta: {
<<<<<<< HEAD
title: "Platform One | Residency",
=======
title: "Platform One | Products | Residency",
>>>>>>> master
bodyClass: "Residency-page",
breadcrumb: "Residency",
},
......
......@@ -366,27 +366,12 @@
</div>
</div>
</Wave>
<<<<<<< HEAD
=======
<vue-easy-lightbox
escDisabled
moveDisabled
:visible="lightbox.visible"
:imgs="lightbox.imgs"
:index="lightbox.index"
@hide="handleHide"
></vue-easy-lightbox>
>>>>>>> master
</div>
</template>
<script>
import PageHeader from "@/components/PageHeader";
import ServicesSummary from "@/components/ServicesSummary";
import Wave from "@/components/Wave";
<<<<<<< HEAD
=======
import VueEasyLightbox from "vue-easy-lightbox";
>>>>>>> master
// import DownloadButton from "@/components/Base/DownloadButton";
export default {
......@@ -394,40 +379,12 @@ export default {
components: {
PageHeader,
Wave,
<<<<<<< HEAD
ServicesSummary,
// DownloadButton,
},
methods: {},
data: function() {
return {};
=======
VueEasyLightbox,
ServicesSummary,
// DownloadButton,
},
methods: {
showImg(index) {
this.lightbox.index = index;
this.lightbox.visible = true;
},
handleHide() {
this.lightbox.visible = false;
},
getImageUrl(filename) {
return require(`@/assets/images/${filename}`);
},
},
data: function() {
return {
// lightbox state
lightbox: {
visible: false,
index: 0, // default: 0
imgs: [require("@/assets/images/logos/CNAP_logo.svg")],
},
};
>>>>>>> master
},
};
</script>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment