diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-07-11 10:50:18 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-07-11 10:50:18 +0200 |
| commit | 0cb9f5e159b1588550830dda4b21010a0412bae9 (patch) | |
| tree | 71c8e122976fcb18526b40ab09cd0861c47ed26f /settings/users.php | |
| parent | d0b625352cc8acc160e22cb2f4e9ae8e10f753f6 (diff) | |
| parent | 0f0aa1827f446ca531732bb1c807c244ef66676a (diff) | |
| download | nextcloud-server-0cb9f5e159b1588550830dda4b21010a0412bae9.tar.gz nextcloud-server-0cb9f5e159b1588550830dda4b21010a0412bae9.zip | |
fix merge conflicts
Diffstat (limited to 'settings/users.php')
| -rw-r--r-- | settings/users.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/settings/users.php b/settings/users.php index a6ce94bb5bd..e066956291b 100644 --- a/settings/users.php +++ b/settings/users.php @@ -59,4 +59,4 @@ $tmpl->assign( 'subadmins', $subadmins); $tmpl->assign( 'quota_preset', $quotaPreset); $tmpl->assign( 'default_quota', $defaultQuota); $tmpl->assign( 'share_notice', $shareNotice); -$tmpl->printPage();
\ No newline at end of file +$tmpl->printPage(); |