diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2022-07-02 06:46:11 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2022-07-02 06:46:11 +0000 |
| commit | 02db8cbffd5ec73f6a2957fc917ea04cdb170c59 (patch) | |
| tree | f04d8d2390f1fbba7b057ca5ec3555cfd6fdaad0 /sinustrom.html | |
| parent | 2022-07-02T06:30:01Z (diff) | |
| download | repos-02db8cbffd5ec73f6a2957fc917ea04cdb170c59.tar.gz repos-02db8cbffd5ec73f6a2957fc917ea04cdb170c59.tar.bz2 repos-02db8cbffd5ec73f6a2957fc917ea04cdb170c59.zip | |
2022-07-02T06:45:01Z
Diffstat (limited to 'sinustrom.html')
| -rw-r--r-- | sinustrom.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sinustrom.html b/sinustrom.html index 9bb603c1c42c..4d84b9946d01 100644 --- a/sinustrom.html +++ b/sinustrom.html @@ -46,7 +46,7 @@ </pre></td></tr> <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>From https://github.com/zpuskas/sinustrom-gentoo-overlay </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + 954d90b...a9d8113 master -> origin/master (forced update) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + a9d8113...58c5da0 master -> origin/master (forced update) </pre></td></tr> <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>hint: You have divergent branches and need to specify how to reconcile them. </pre></td></tr> |