cgit v1.2.3'/> <meta name='robots' content='noindex, nofollow'/> <link rel='stylesheet' type='text/css' href='/cgit.css'/> <link rel='shortcut icon' href='/favicon.ico'/> <link rel='alternate' title='Atom feed' href='http://localhost/dockerfiles/atom/?h=master.sync-conflict-20230910-230149-6DL2MHG' type='application/atom+xml'/> </head> <body> <div id='cgit'><table id='header'> <tr> <td class='logo' rowspan='2'><a href='/'><img src='/cgit.png' alt='cgit logo'/></a></td> <td class='main'><a href='/'>index</a> : <a title='dockerfiles' href='/dockerfiles/'>dockerfiles</a></td><td class='form'><form method='get'> <select name='h' onchange='this.form.submit();'> <option value='master'>master</option> <option value='master.sync-conflict-20230908-173316-6DL2MHG'>master.sync-conflict-20230908-173316-6DL2MHG</option> <option value='master.sync-conflict-20230910-230149-6DL2MHG' selected='selected'>master.sync-conflict-20230910-230149-6DL2MHG</option> <option value='origin/HEAD'>origin/HEAD</option> <option value='origin/master'>origin/master</option> </select> <input type='submit' value='switch'/></form></td></tr> <tr><td class='sub'>Unnamed repository; edit this file 'description' to name the repository.</td><td class='sub right'></td></tr></table> <table class='tabs'><tr><td> <a href='/dockerfiles/?h=master.sync-conflict-20230910-230149-6DL2MHG'>summary</a><a href='/dockerfiles/refs/?h=master.sync-conflict-20230910-230149-6DL2MHG'>refs</a><a href='/dockerfiles/log/?h=master.sync-conflict-20230910-230149-6DL2MHG'>log</a><a href='/dockerfiles/tree/?h=master.sync-conflict-20230910-230149-6DL2MHG'>tree</a><a class='active' href='/dockerfiles/commit/?h=master.sync-conflict-20230910-230149-6DL2MHG'>commit</a><a href='/dockerfiles/diff/?h=master.sync-conflict-20230910-230149-6DL2MHG'>diff</a><a href='/dockerfiles/stats/?h=master.sync-conflict-20230910-230149-6DL2MHG'>stats</a></td><td class='form'><form class='right' method='get' action='/dockerfiles/log/'> <input type='hidden' name='h' value='master.sync-conflict-20230910-230149-6DL2MHG'/><select name='qt'> <option value='grep'>log msg</option> <option value='author'>author</option> <option value='committer'>committer</option> <option value='range'>range</option> </select> <input class='txt' type='search' size='10' name='q' value=''/> <input type='submit' value='search'/> </form> </td></tr></table> <div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='h' value='master.sync-conflict-20230910-230149-6DL2MHG'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'> <tr><th>author</th><td>breadcat</td><td class='right'>2023-08-21 16:58:48 +0100</td></tr> <tr><th>committer</th><td>breadcat</td><td class='right'>2023-08-21 16:58:48 +0100</td></tr> <tr><th>commit</th><td colspan='2' class='sha1'><a href='/dockerfiles/commit/?h=master.sync-conflict-20230910-230149-6DL2MHG&id=db7bc80039b7e5a2829c7eb16da09b9f680d9016'>db7bc80039b7e5a2829c7eb16da09b9f680d9016</a> (<a href='/dockerfiles/patch/?id=db7bc80039b7e5a2829c7eb16da09b9f680d9016'>patch</a>)</td></tr> <tr><th>tree</th><td colspan='2' class='sha1'><a href='/dockerfiles/tree/?h=master.sync-conflict-20230910-230149-6DL2MHG'>09790a34085ae271d9a83bf2110b70d2d42ff7c3</a></td></tr> <tr><th>parent</th><td colspan='2' class='sha1'><a href='/dockerfiles/commit/?h=master.sync-conflict-20230910-230149-6DL2MHG&id=eb69f94904c6b86be05b2b22fb6febcd8ba513cc'>eb69f94904c6b86be05b2b22fb6febcd8ba513cc</a> (<a href='/dockerfiles/diff/?h=master.sync-conflict-20230910-230149-6DL2MHG&id2=eb69f94904c6b86be05b2b22fb6febcd8ba513cc'>diff</a>)</td></tr><tr><th>download</th><td colspan='2' class='sha1'><a href='/dockerfiles/snapshot/dockerfiles-master.sync-conflict-20230910-230149-6DL2MHG.tar.gz'>dockerfiles-master.sync-conflict-20230910-230149-6DL2MHG.tar.gz</a><br/><a href='/dockerfiles/snapshot/dockerfiles-master.sync-conflict-20230910-230149-6DL2MHG.tar.bz2'>dockerfiles-master.sync-conflict-20230910-230149-6DL2MHG.tar.bz2</a><br/><a href='/dockerfiles/snapshot/dockerfiles-master.sync-conflict-20230910-230149-6DL2MHG.zip'>dockerfiles-master.sync-conflict-20230910-230149-6DL2MHG.zip</a><br/></td></tr></table> <div class='commit-subject'>Improve music function<span class='decoration'><a class='branch-deco' href='/dockerfiles/log/?h=master.sync-conflict-20230910-230149-6DL2MHG'>master.sync-conflict-20230910-230149-6DL2MHG</a><a class='branch-deco' href='/dockerfiles/log/?h=master.sync-conflict-20230908-173316-6DL2MHG'>master.sync-conflict-20230908-173316-6DL2MHG</a></span></div><div class='commit-msg'>Filters some junk (thanks Spotify!) and adds links to songs </div><div class='diffstat-header'><a href='/dockerfiles/diff/?h=master.sync-conflict-20230910-230149-6DL2MHG'>Diffstat</a></div><table summary='diffstat' class='diffstat'>