From a52c71192ba9196af959868b1c944d517b2e140d Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Mon, 15 Apr 2019 14:54:08 +0200
Subject: [PATCH] fix after merge from master

---
 neonView/ActivityTimeline_view/ActivityTimeline_view.aod | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 neonView/ActivityTimeline_view/ActivityTimeline_view.aod

diff --git a/neonView/ActivityTimeline_view/ActivityTimeline_view.aod b/neonView/ActivityTimeline_view/ActivityTimeline_view.aod
deleted file mode 100644
index e69de29bb2..0000000000
-- 
GitLab