Fix failing tests

2026-01-20 03:41:23 +00:00 · 2019-04-15 19:49:42 -03:00 · 2019-04-15 19:49:42 -03:00 · d4a4c9f362
commit d4a4c9f362
parent 72c1d3914a
2 changed files with 18 additions and 20 deletions
--- a/webapp/components/notifications/NotificationPostCard.vue
+++ b/webapp/components/notifications/NotificationPostCard.vue
@ -28,7 +28,7 @@
 </template>

 <script>
-import HcUser from '~/components/User.vue'
+import HcUser from '~/components/User'

 export default {
  name: 'HcPostCard',
--- a/webapp/store/auth.js
+++ b/webapp/store/auth.js
@ -83,28 +83,26 @@ export const actions = {
            role
            about
            locationName
-<<<<<<< HEAD
-            notifications(read: false, orderBy: createdAt_desc) {
-              id
-              read
-              createdAt
-              post {
-                author {
-                  id
-                  slug
-                  name
-                  disabled
-                  deleted
-                }
-                title
-                contentExcerpt
-                slug
-              }
-=======
            socialMedia {
              id
              url
->>>>>>> f6eb5474d1d8ff180daa5f7f73e3375cff95b2de
+            }
+          }
+          notifications(read: false, orderBy: createdAt_desc) {
+            id
+            read
+            createdAt
+            post {
+              author {
+                id
+                slug
+                name
+                disabled
+                deleted
+              }
+              title
+              contentExcerpt
+              slug
            }
          }
        }`)