<div class="configurationCard {{axisGroup.dataAvailable ? 'enableDragging': 'disableDragging'}}"
  [style.border-left-color]="axisGroup.dataAvailable ? axisGroup.displayGroup.fill.hsl().string(): 'rgb(197, 185, 172)'">
  <!-- BOSTON_WARM_GRAY -->
  <mat-list-item>
    <div class="listItem">
      <div style="display:inline-block; vertical-align: middle;">
        <div class="label">
          {{axisGroup.label}}
        </div>
        <div class="tinytext" *ngIf="!resourceCodesForCard.dataAvailable">
          No data between
          {{appTimeIntervalString}}
        </div>
      </div>
    </div>
  </mat-list-item>
</div>

<div class="configurationCard {{axisGroup.dataAvailable ? 'enableDragging': 'disableDragging'}}"
  [style.border-left-color]="axisGroup.dataAvailable ? axisGroup.displayGroup.fill.hsl().string(): 'rgb(197, 185, 172)'">
  <!-- BOSTON_WARM_GRAY -->
  <mat-list-item>
    <div class="listItem">
      <div style="display:inline-block; vertical-align: middle;">
        <div class="label">
          {{axisGroup.label}}
        </div>
        <div class="tinytext" *ngIf="!axisGroup.dataAvailable">
          No data between
          {{appTimeIntervalString}}
        </div>
      </div>
    </div>
  </mat-list-item>
</div>

Fix a bad merge conflict in data selector.
Fix a bad merge conflict in data selector.

Change-Id: Ia4b59b3f910b72dcf7c997fdba439c976f2d8b37
GitOrigin-RevId: 9c24819c54d2d4ab0dc5669e21559fe60287406d
