Sfoglia il codice sorgente

setting up messageFactory

tags/0.0.1^2
K Rob 3 anni fa
parent
commit
b42d2c6921
1 ha cambiato i file con 5 aggiunte e 1 eliminazioni
  1. 5
    1
      frontend/src/views/HomeView.vue

+ 5
- 1
frontend/src/views/HomeView.vue Vedi File

12
     
12
     
13
     p(v-else-if="matches.length===0") No matches.
13
     p(v-else-if="matches.length===0") No matches.
14
     p(v-else) Loading...
14
     p(v-else) Loading...
15
+<<<<<<< HEAD
15
     <w-flex class="wrap">
16
     <w-flex class="wrap">
16
     <w-button @click="notify" bg-color="success"> notify </w-button>
17
     <w-button @click="notify" bg-color="success"> notify </w-button>
17
       <w-button @click="chat" bg-color="error"> chat </w-button>
18
       <w-button @click="chat" bg-color="error"> chat </w-button>
18
     </w-flex> 
19
     </w-flex> 
20
+=======
21
+    <w-button @click="notify" bg-color="success"> notify </w-button>
22
+    
23
+>>>>>>> da796e1 (setting up messageFactory)
19
 </template>
24
 </template>
20
 
25
 
21
 <script>
26
 <script>
96
            })
101
            })
97
            this.notify(res)
102
            this.notify(res)
98
         }
103
         }
99
-
100
     },
104
     },
101
 }
105
 }
102
 </script>
106
 </script>

Loading…
Annulla
Salva