From 4f6587e1f68596b6edb3a68e5c65a88fa585d156 Mon Sep 17 00:00:00 2001
From: Amaury <amaury.joly@etu.univ-lyon1.fr>
Date: Fri, 9 Jul 2021 12:18:08 +0200
Subject: [PATCH] merge

---
 src/main.ts | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/main.ts b/src/main.ts
index a684a73..b832866 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,16 +1,8 @@
 import { ListenerRssAggregator } from "listener-rss-agregator";
-<<<<<<< HEAD
 
 type ListenerData = {
   ChannelId: number;
 };
-=======
-import { ListenerRSSInfos } from "listener-rss";
-type ListenerData = {
-  ChannelId: number;
-  firstUpdate: boolean;
-} & ListenerRSSInfos;
->>>>>>> origin/testing
 
 let myManager: ListenerRssAggregator;
 let listenersDataBinding = new Map<string, ListenerData>();
@@ -34,11 +26,7 @@ async function register({
   });
 
   logger.warn("setting register");
-<<<<<<< HEAD
   fs.appendFileSync(path.join(basePath, "/storage.bd"), "");
-=======
-  fs.appendFileSync(path.join(basePath, "/storage.bd"), ""); // append
->>>>>>> origin/testing
 
   const configAggregator = await ListenerRssAggregator.instantiateAggregator(
     path.join(basePath, "/storage.bd")