diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-08-31 09:41:07 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-08-31 09:41:07 +0200 |
| commit | e9462ba14529b7172ba5a21e7985d24de91faa37 (patch) | |
| tree | c2270ca2975f6683a361c5959894b6bbc954475d /view/pdl/mod_webpages.pdl | |
| parent | 2b9322fc7d879fecbe334083bbd028538c985c54 (diff) | |
| parent | b775a1aa0e36a74f0f937d85f458fd12af18a264 (diff) | |
| download | volse-hubzilla-e9462ba14529b7172ba5a21e7985d24de91faa37.tar.gz volse-hubzilla-e9462ba14529b7172ba5a21e7985d24de91faa37.tar.bz2 volse-hubzilla-e9462ba14529b7172ba5a21e7985d24de91faa37.zip | |
resolve merge conflict
Diffstat (limited to 'view/pdl/mod_webpages.pdl')
| -rw-r--r-- | view/pdl/mod_webpages.pdl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/view/pdl/mod_webpages.pdl b/view/pdl/mod_webpages.pdl index b62ec6e7c..9e4d604ba 100644 --- a/view/pdl/mod_webpages.pdl +++ b/view/pdl/mod_webpages.pdl @@ -1,4 +1,4 @@ [region=aside] [widget=design_tools][/widget] -[widget=website_import_tools][/widget] +[widget=website_portation_tools][/widget] [/region]
\ No newline at end of file |