diff options
| author | Cecil Hugh Watson <knoppmyth@gmail.com> | 2008-12-11 07:06:21 (GMT) |
|---|---|---|
| committer | Cecil Hugh Watson <knoppmyth@gmail.com> | 2008-12-11 07:06:21 (GMT) |
| commit | e019db2c0c29ab1e825f983987275b3b1a597d4f (patch) | |
| tree | 68657226c37db0910792a475ac8b00247efd568f /abs/core-testing | |
| parent | 54e39512d743caf5afe2f587536135c450ea4fcf (diff) | |
| download | linhes_pkgbuild-e019db2c0c29ab1e825f983987275b3b1a597d4f.zip linhes_pkgbuild-e019db2c0c29ab1e825f983987275b3b1a597d4f.tar.gz linhes_pkgbuild-e019db2c0c29ab1e825f983987275b3b1a597d4f.tar.bz2 | |
Fixed LinHES-release. PKGBUILD for MythAppleTrailers.
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 |