From: Andrew Gundersen <gundersena@xavier.edu>
Date: Mon, 29 Mar 2021 15:18:26 +0000 (-0500)
Subject: merging
X-Git-Tag: v0.9~9
X-Git-Url: https://andrewgundersen.net/repos?a=commitdiff_plain;h=fcac59a7a0a5c9dbf6a57ba3485585544e6865b9;p=mime-chat

merging
---

fcac59a7a0a5c9dbf6a57ba3485585544e6865b9
diff --cc src/App.vue
index ce8fa5b,99fa548..be19d8e
--- a/src/App.vue
+++ b/src/App.vue
@@@ -1,7 -1,7 +1,7 @@@
  <template>
 -  <div id="app" v-if="ready">
 +  <div id="app" v-if="(windowReady && sessionReady)">
  
-     <button class="titlebar" />
+     <button id="titlebar" />
  
      <!-- Minimize and exit buttons. -->
      <span class="menu">
diff --cc windowState.json
index 26c34cb,29b9ce1..4394ee1
--- a/windowState.json
+++ b/windowState.json
@@@ -1,1 -1,1 +1,5 @@@
- {"w":629,"h":500,"x":1423,"y":657}
 -{"w":622,"h":616,"x":1163,"y":499}
++<<<<<<< HEAD
++{"w":629,"h":500,"x":1423,"y":657}
++=======
++{"w":622,"h":616,"x":1163,"y":499}
++>>>>>>> logout