diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 21:54:24 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 21:54:24 +0100 |
| commit | da491770b9ba5f179e18db461c49cb6f1ccf0e1f (patch) | |
| tree | d3e34a8bd906741ab18cf69d8d4f732853e26ade /metadata/timestamp.x | |
| parent | ad6182343997a405079870a2fe91c4e0c6b94595 (diff) | |
| parent | 5a165c60b9b8c4847067cb83b4be7da785d01f93 (diff) | |
gentoo resync : 28.09.2019
Diffstat (limited to 'metadata/timestamp.x')
| -rw-r--r-- | metadata/timestamp.x | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/timestamp.x b/metadata/timestamp.x index 890717012cd2..fe66260b8976 100644 --- a/metadata/timestamp.x +++ b/metadata/timestamp.x @@ -1 +1,5 @@ +<<<<<<< HEAD 1569432901 Wed 25 Sep 2019 05:35:01 PM UTC +======= +1569647101 Sat 28 Sep 2019 05:05:01 AM UTC +>>>>>>> next |