diff options
| author | José Valim <jose.valim@gmail.com> | 2009-07-12 16:29:15 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-07-12 16:29:15 +0200 |
| commit | 3075ae0611625657de052a2ad93cf083d24bb803 (patch) | |
| tree | f421dda228ef1bbe79a31c9c5b95d502b041adf9 /railties/lib/generators/rails/app/templates/public/422.html | |
| parent | cca16a015d52a8fde0d4f66970ee333900ca21cc (diff) | |
| parent | c863388039ff6e97447be86184d41fbf30f0f389 (diff) | |
| download | rails-3075ae0611625657de052a2ad93cf083d24bb803.tar.gz rails-3075ae0611625657de052a2ad93cf083d24bb803.tar.bz2 rails-3075ae0611625657de052a2ad93cf083d24bb803.zip | |
Solving merge conflicts.
Diffstat (limited to 'railties/lib/generators/rails/app/templates/public/422.html')
| -rw-r--r-- | railties/lib/generators/rails/app/templates/public/422.html | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/railties/lib/generators/rails/app/templates/public/422.html b/railties/lib/generators/rails/app/templates/public/422.html index b54e4a3cad..9c3c96670b 100644 --- a/railties/lib/generators/rails/app/templates/public/422.html +++ b/railties/lib/generators/rails/app/templates/public/422.html @@ -1,23 +1,20 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> - +<!DOCTYPE html> +<html> <head> <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> <title>The change you wanted was rejected (422)</title> - <style type="text/css"> - body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; } - div.dialog { - width: 25em; - padding: 0 4em; - margin: 4em auto 0 auto; - border: 1px solid #ccc; - border-right-color: #999; - border-bottom-color: #999; - } - h1 { font-size: 100%; color: #f00; line-height: 1.5em; } - </style> + <style type="text/css"> + body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; } + div.dialog { + width: 25em; + padding: 0 4em; + margin: 4em auto 0 auto; + border: 1px solid #ccc; + border-right-color: #999; + border-bottom-color: #999; + } + h1 { font-size: 100%; color: #f00; line-height: 1.5em; } + </style> </head> <body> @@ -27,4 +24,4 @@ <p>Maybe you tried to change something you didn't have access to.</p> </div> </body> -</html>
\ No newline at end of file +</html> |