M .gitignore → .gitignore

@@ -82,6 +82,7 @@ .idea
 nbproject
 public/uploads/*
 !public/uploads/.gitkeep
+.vscode
 
 ############################
 # Node.js

A .vscode/settings.json

@@ -0,0 +1,1 @@ 
+123,125

M app/src/pages/Event.js → app/src/pages/Event.js

@@ -68,6 +68,10 @@ };
 
   const addToMyEvents = () => {
     if (!event) return;
+<<<<<<< HEAD
+=======
+    window.localStorage.setItem('addToMyEvents', event.id);
+>>>>>>> fd8fb48736c1f2b5c5437607a5cd86f0b9523d93
     setIsAddToMyEvent(true);
   };