diff options
author | Ralph Amissah <ralph@amissah.com> | 2011-02-01 16:55:53 -0500 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2011-02-01 16:55:53 -0500 |
commit | 704af1677c2904d0ccdff9fe75ed030ce6f060c8 (patch) | |
tree | 01298810b5b8b91031583e989fa774e4e000bfc7 /data/doc/sisu/v2/markup-samples/samples/_sisu/skin/yml/skin_countries.yml | |
parent | debian/changelog 2.7.9-1 (diff) | |
parent | v3 introduced as development branch, invoked using "sisu --v3 [instructions] (diff) |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'data/doc/sisu/v2/markup-samples/samples/_sisu/skin/yml/skin_countries.yml')
-rw-r--r-- | data/doc/sisu/v2/markup-samples/samples/_sisu/skin/yml/skin_countries.yml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/data/doc/sisu/v2/markup-samples/samples/_sisu/skin/yml/skin_countries.yml b/data/doc/sisu/v2/markup-samples/samples/_sisu/skin/yml/skin_countries.yml index 179b9978..274e19fa 100644 --- a/data/doc/sisu/v2/markup-samples/samples/_sisu/skin/yml/skin_countries.yml +++ b/data/doc/sisu/v2/markup-samples/samples/_sisu/skin/yml/skin_countries.yml @@ -479,4 +479,3 @@ id: WF name: Wallis and Futuna Islands id: EH name: Western Sahara - |