From 2418a97b413066036ad3f14fe884a49166bd3125 Mon Sep 17 00:00:00 2001
From: Leandro Nunes dos Santos <leandronunes@gmail.com>
Date: Tue, 10 May 2016 09:25:19 -0300
Subject: [PATCH] fix merge conflit

---
 src/app/main/main.component.ts | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/app/main/main.component.ts b/src/app/main/main.component.ts
index 50bf462..c3731b7 100644
--- a/src/app/main/main.component.ts
+++ b/src/app/main/main.component.ts
@@ -95,16 +95,10 @@ export class EnvironmentContent {
         ArticleBlogComponent, ArticleViewComponent, BoxesComponent, BlockComponent,
         EnvironmentComponent, PeopleBlockComponent,
         LinkListBlockComponent, CommunitiesBlockComponent, HtmlEditorComponent,
-<<<<<<< HEAD
         MainBlockComponent, RecentDocumentsBlockComponent, Navbar, SidebarComponent, ProfileImageBlockComponent,
-        MembersBlockComponent, NoosferoTemplate, DateFormat, RawHTMLBlockComponent
+        MembersBlockComponent, NoosferoTemplate, DateFormat, RawHTMLBlockComponent, StatisticsBlockComponent
     ].concat(plugins.mainComponents).concat(plugins.hotspots),
-=======
-        MainBlockComponent, RecentDocumentsBlockComponent, Navbar, ProfileImageBlockComponent,
-        MembersBlockComponent, NoosferoTemplate, DateFormat, RawHTMLBlockComponent,
-        StatisticsBlockComponent
-    ],
->>>>>>> adding basic information of statisticst block
+
     providers: [AuthService, SessionService, NotificationService, BodyStateClassesService]
 })
 @StateConfig([
--
libgit2 0.21.2