diff options
| author | Helmut Grohne <helmut@subdivi.de> | 2014-07-22 08:56:42 +0200 |
|---|---|---|
| committer | Helmut Grohne <helmut@subdivi.de> | 2014-07-22 08:56:42 +0200 |
| commit | 04597f25729740406775a3dff528c9774c84efd5 (patch) | |
| tree | fe905fc94afbdcfad60d5aaf88886a1f10f92a8c /dedup/templates | |
| parent | ba9ae116e0bbb25e2df327ba48c82472ccfa2690 (diff) | |
| parent | d48c3c208ee6ba54225b3eb68ce5c9f3c894bfa4 (diff) | |
| download | debian-dedup-04597f25729740406775a3dff528c9774c84efd5.tar.gz | |
Merge branch master into multiarch
Resolve accumulated conflicts. In particular webapp.py gained a few
non-trivial ones, such as changes in InternalRedirect or usage of
contextlib.closing.
Conflicts:
schema.sql
webapp.py
Diffstat (limited to 'dedup/templates')
| -rw-r--r-- | dedup/templates/index.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dedup/templates/index.html b/dedup/templates/index.html index 7c9000f..169027e 100644 --- a/dedup/templates/index.html +++ b/dedup/templates/index.html @@ -28,7 +28,7 @@ {% block content %} <h1>Debian duplication detector</h1> <ul> -<li>To inspect a particlar binary package, go to <pre>binary/<packagename></pre> Example: <a href="binary/git">binary/git</a> +<li>To inspect a particular binary package, go to <pre>binary/<packagename></pre> Example: <a href="binary/git">binary/git</a> <div style="display:none" id="form_div"><fieldset> <legend>Inspect package</legend> <noscript><b>This form is dysfunctional when javascript is not enabled</b></noscript> |