Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Fix rebase merge error.
Browse files Browse the repository at this point in the history
  • Loading branch information
mtho11 committed Sep 9, 2015
1 parent cfbcc29 commit 552abe9
Showing 1 changed file with 1 addition and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ module HawkularMetrics {
private autoRefreshPromise:ng.IPromise<number>;
private resourceList;
public modalInstance;
public alertList;
public selectCount:number = 0;
public lastUpdateTimestamp:Date;
public startTimeStamp:TimestampInMillis;
Expand Down

0 comments on commit 552abe9

Please sign in to comment.