diff options
Diffstat (limited to 'abs/core-testing')
| -rw-r--r-- | abs/core-testing/LinHES-config/LinHES-release | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/abs/core-testing/LinHES-config/LinHES-release b/abs/core-testing/LinHES-config/LinHES-release index fc10c90..0e9e72b 100644 --- a/abs/core-testing/LinHES-config/LinHES-release +++ b/abs/core-testing/LinHES-config/LinHES-release @@ -1,5 +1 @@ -<<<<<<< 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 |