diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 22:19:36 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-10-14 23:22:23 +0100 |
| commit | 4b19be30aa626b327c885dae62c559ec0e9fb935 (patch) | |
| tree | 76e74807bc479502e13866b581b6bf86734ec634 /metadata/timestamp.commit | |
| parent | 30d6f67c98d149508509d5e86f176d558793acc0 (diff) | |
gentoo resync : 13.10.2019
Diffstat (limited to 'metadata/timestamp.commit')
| -rw-r--r-- | metadata/timestamp.commit | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit index 3fe4d2c5aaa9..6ac56afa0916 100644 --- a/metadata/timestamp.commit +++ b/metadata/timestamp.commit @@ -1,5 +1 @@ -<<<<<<< HEAD -74076efd0c11461da7b26e0a03cd81988140f0d0 1569432784 2019-09-25T17:33:04+00:00 -======= -a15d0f0526aa0dcb964abf8bef5e0348d577878e 1569643259 2019-09-28T04:00:59+00:00 ->>>>>>> next +762e42a34e94c32855309c1b377283c665869623 1570998878 2019-10-13T20:34:38+00:00 |