Skip to content

Commit

Permalink
fix mistake in conflict resolution
Browse files Browse the repository at this point in the history
  • Loading branch information
rtodling committed Oct 29, 2024
1 parent d6db414 commit 7f16db2
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions components.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,6 @@ GEOSana_GridComp:
tag: g5.41.3
develop: develop

mksi:
local: ./src/Components/@GEOSana_GridComp/GEOSaana_GridComp/GSI_GridComp/@mksi
remote: ../GEOS_mksi.git
tag: g5.41.2
develop: develop

mksi:
local: ./src/Components/@GEOSana_GridComp/GEOSaana_GridComp/GSI_GridComp/@mksi
remote: ../GEOS_mksi.git
Expand Down

0 comments on commit 7f16db2

Please sign in to comment.