diff options
| author | Chris McDonough <chrism@plope.com> | 2013-10-02 16:09:57 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-10-02 16:09:57 -0400 |
| commit | 9c3c9a8075f250122d7827a71b6217213180fe70 (patch) | |
| tree | 39ebca0f2dbdd352a1d94d17c33acbb61a02393a /docs/quick_tour | |
| parent | af5fa07ca2fcc48ab357c0db4e1301bb960addca (diff) | |
| parent | a2d4c260952a8e2329df0c4a66d7239f2e8d0652 (diff) | |
| download | pyramid-9c3c9a8075f250122d7827a71b6217213180fe70.tar.gz pyramid-9c3c9a8075f250122d7827a71b6217213180fe70.tar.bz2 pyramid-9c3c9a8075f250122d7827a71b6217213180fe70.zip | |
fix merge conflict
Diffstat (limited to 'docs/quick_tour')
| -rw-r--r-- | docs/quick_tour/jinja2/hello_world.jinja2 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/quick_tour/jinja2/hello_world.jinja2 b/docs/quick_tour/jinja2/hello_world.jinja2 index e177744b5..7a902dd3a 100644 --- a/docs/quick_tour/jinja2/hello_world.jinja2 +++ b/docs/quick_tour/jinja2/hello_world.jinja2 @@ -1,4 +1,5 @@ -<html xmlns="http://www.w3.org/1999/xhtml"> +<!DOCTYPE html> +<html lang="en"> <head> <title>Hello World</title> </head> |