all repos — caroster @ 665e71f2ca14f48b0cb018a97b2c48f36825e842

[Octree] Group carpool to your event https://caroster.io

fixup! merge master
Hadrien Froger hadrien@octree.ch
Fri, 17 Jul 2020 17:58:04 +0100
commit

665e71f2ca14f48b0cb018a97b2c48f36825e842

parent

599e7a0216fc201a29d91ff7e86a162e51b63ed2

2 files changed, 1 insertions(+), 4 deletions(-)

jump to
M app/src/pages/Event.js → app/src/pages/Event.js 
@@ -68,10 +68,7 @@ };
 
   const addToMyEvents = () => {
     if (!event) return;
-<<<<<<< HEAD
-=======
     window.localStorage.setItem('addToMyEvents', event.id);
->>>>>>> fd8fb48736c1f2b5c5437607a5cd86f0b9523d93
     setIsAddToMyEvent(true);
   };
M e2e/reports/.gitignore → e2e/reports/.gitignore 
@@ -2,4 +2,4 @@ *
 !index.html
 !screenshots.js
 !gerkhins.js
-!/.gitignore+!/.gitignore