diff options
Diffstat (limited to 'abs/core-testing/LinHES-config/LinHES-release')
| -rw-r--r-- | abs/core-testing/LinHES-config/LinHES-release | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/abs/core-testing/LinHES-config/LinHES-release b/abs/core-testing/LinHES-config/LinHES-release index c63627b..fc10c90 100644 --- a/abs/core-testing/LinHES-config/LinHES-release +++ b/abs/core-testing/LinHES-config/LinHES-release @@ -1 +1,5 @@ -LinHES R6.00.04 +<<<<<<< HEAD:abs/core-testing/LinHES-config/LinHES-release +LinHES R6.00.05 +======= +LinHES R6.00.04 +>>>>>>> origin/HEAD:abs/core-testing/LinHES-config/LinHES-release |