Download as
Browse Code »

Commit 2418a97b413066036ad3f14fe884a49166bd3125

Authored by Leandro Santos
1 parent 2efd5865
Exists in master and in 26 other branches activities_block, btn-new-post, cosmetic_changes_people_and_communities_block, edit-blocks, edit-header-footer, env-tags-block, forgot_password, layout_support, list_articles_on_blog, loading-indicator-component, login_modal, login_modal_improve, person_info_block, profile-article-resolvers, profile-blocks-sass, profile_description_block_component, profile_page_improvements, recent-activities, remove-article-confirmation, skin-small-change, staging, tags-block, theme-skin-yellow, translations, updated_signup_page, users_profile_page

fix merge conflit

Showing 1 changed file with 2 additions and 8 deletions   Show diff stats
src/app/main/main.component.ts
  Diff comments   View file @2418a97
@@ -95,16 +95,10 @@ export class EnvironmentContent { @@ -95,16 +95,10 @@ export class EnvironmentContent {
95 ArticleBlogComponent, ArticleViewComponent, BoxesComponent, BlockComponent, 95 ArticleBlogComponent, ArticleViewComponent, BoxesComponent, BlockComponent,
96 EnvironmentComponent, PeopleBlockComponent, 96 EnvironmentComponent, PeopleBlockComponent,
97 LinkListBlockComponent, CommunitiesBlockComponent, HtmlEditorComponent, 97 LinkListBlockComponent, CommunitiesBlockComponent, HtmlEditorComponent,
98 -<<<<<<< HEAD  
99 MainBlockComponent, RecentDocumentsBlockComponent, Navbar, SidebarComponent, ProfileImageBlockComponent, 98 MainBlockComponent, RecentDocumentsBlockComponent, Navbar, SidebarComponent, ProfileImageBlockComponent,
100 - MembersBlockComponent, NoosferoTemplate, DateFormat, RawHTMLBlockComponent 99 + MembersBlockComponent, NoosferoTemplate, DateFormat, RawHTMLBlockComponent, StatisticsBlockComponent
101 ].concat(plugins.mainComponents).concat(plugins.hotspots), 100 ].concat(plugins.mainComponents).concat(plugins.hotspots),
102 -=======  
103 - MainBlockComponent, RecentDocumentsBlockComponent, Navbar, ProfileImageBlockComponent,  
104 - MembersBlockComponent, NoosferoTemplate, DateFormat, RawHTMLBlockComponent,  
105 - StatisticsBlockComponent  
106 - ],  
107 ->>>>>>> adding basic information of statisticst block 101 +
108 providers: [AuthService, SessionService, NotificationService, BodyStateClassesService] 102 providers: [AuthService, SessionService, NotificationService, BodyStateClassesService]
109 }) 103 })
110 @StateConfig([ 104 @StateConfig([