diff options
| author | Shpuld Shpuldson <shp@cock.li> | 2020-07-14 11:44:06 +0300 |
|---|---|---|
| committer | Shpuld Shpuldson <shp@cock.li> | 2020-07-14 11:44:06 +0300 |
| commit | cac1418affbc0ae91bce2a4d4c14046e73484116 (patch) | |
| tree | b8a9ef91853d7f4d3f35e632e0b3e71b5dd79c7d /src/App.vue | |
| parent | 78ec84477e978a654ecfd482157dbf04a69f32e2 (diff) | |
| parent | 3e09a708f600b47dde831eeddb412828b38a0cf4 (diff) | |
fix merge conflicts
Diffstat (limited to 'src/App.vue')
| -rw-r--r-- | src/App.vue | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/App.vue b/src/App.vue index 6386b3dc..0276c6a6 100644 --- a/src/App.vue +++ b/src/App.vue @@ -77,6 +77,7 @@ </div> </div> </nav> + <div class="app-bg-wrapper app-container-wrapper" /> <div id="content" class="container underlay" @@ -112,9 +113,7 @@ {{ $t("login.hint") }} </router-link> </div> - <transition> - <router-view /> - </transition> + <router-view /> </div> <media-modal /> </div> |