From 69e40a7cf1c868a39df248a3c7848a79219f1257 Mon Sep 17 00:00:00 2001
From: Richard <richard.fazzio@unify.com>
Date: Thu, 4 Jan 2018 11:08:31 -0500
Subject: [PATCH] Fixed Issue with multiple emails

---
 customer-support |  1 -
 public/main.js   | 21 ---------------------
 server.js        |  1 -
 3 files changed, 23 deletions(-)
 delete mode 160000 customer-support

diff --git a/customer-support b/customer-support
deleted file mode 160000
index e707d85..0000000
--- a/customer-support
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e707d85aa52167100430da7f0f9237421af08b6e
diff --git a/public/main.js b/public/main.js
index fbe8a74..997e9f5 100644
--- a/public/main.js
+++ b/public/main.js
@@ -48,26 +48,6 @@ document.addEventListener('DOMContentLoaded', event => {
   }
 
   function createComplaint(e) {
-<<<<<<< HEAD
-
-    if(model.name == undefined || model.email == undefined || model.topic == undefined || model.message == undefined){
-  
-      let resp = "";
-
-      if(model.name == undefined){
-        resp+="**Name** is empty, please fill in your name. \n\n";
-      }
-      if(model.email == undefined){
-        resp+="**Email** is empty, please fill in your email adress. \n\n";
-      }
-      if(model.topic == undefined){
-        resp+="**Issue** You did not select a relevant issue, please select **other** if you're having a different problem not listed.\n\n";
-      }
-      if(model.message == undefined){
-        resp+="**Message** Please fill out a message decribing your issue.\n\n";
-      }
-
-=======
     e.preventDefault();
 
     if (!model.name || !model.email || !model.topic || !model.message) {
@@ -76,7 +56,6 @@ document.addEventListener('DOMContentLoaded', event => {
       !model.email && (resp += 'Please fill in your email adress. \n\n');
       !model.topic && (resp += `You did not select a relevant issue, please select **other** if you're having a different problem not listed.\n\n`);
       !model.message && (resp += 'Please fill out a message decribing your issue.\n\n');
->>>>>>> e707d85aa52167100430da7f0f9237421af08b6e
       alert(resp);
       return;
     }
diff --git a/server.js b/server.js
index b1eb12f..0163bb8 100644
--- a/server.js
+++ b/server.js
@@ -198,5 +198,4 @@ emitter.on('message-received', async data => {
 
 
 
-
 server.listen(port, _ => console.log(`Server listening at port ${port}`));