diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-01-22 14:02:40 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-01-22 14:02:40 -0800 |
commit | 725b0da2db33944857d774b720703f6de12453d1 (patch) | |
tree | d2c23c6a4103f3e55ccd918cb64218a0d521aa9c /git-merge-index.html | |
parent | 9c6a43e04189342749cf44a5206b86d41e642279 (diff) | |
download | git-htmldocs-725b0da2db33944857d774b720703f6de12453d1.tar.gz |
Autogenerated HTML docs for v2.25.0-2-g23237
Diffstat (limited to 'git-merge-index.html')
-rw-r--r-- | git-merge-index.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-index.html b/git-merge-index.html index 9fbfa5cc8..e3c1ec29c 100644 --- a/git-merge-index.html +++ b/git-merge-index.html @@ -436,7 +436,7 @@ thead, p.table.header { p.table {
margin-top: 0;
}
-/* Because the table frame attribute is overriden by CSS in most browsers. */
+/* Because the table frame attribute is overridden by CSS in most browsers. */
div.tableblock > table[frame="void"] {
border-style: none;
}
|