diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-22 13:20:25 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-22 13:20:25 +0200 |
| commit | 6b9072de581cf574f129bc1371355dbf91b818d8 (patch) | |
| tree | 2f15f77b0e4f85ef84d93d7409ab058c685275c0 /lib/app.php | |
| parent | c8cb870a27d1c2aa8ce1180114101cdcbccdf95b (diff) | |
| parent | 1bba4456420d1824ab6d58f3d9bb523fcde5c4c2 (diff) | |
| download | nextcloud-server-6b9072de581cf574f129bc1371355dbf91b818d8.tar.gz nextcloud-server-6b9072de581cf574f129bc1371355dbf91b818d8.zip | |
fix merge conflicts
Diffstat (limited to 'lib/app.php')
| -rwxr-xr-x | lib/app.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/app.php b/lib/app.php index bd432109b23..9f7d23872f3 100755 --- a/lib/app.php +++ b/lib/app.php @@ -303,8 +303,6 @@ class OC_App{ $settings[] = array( "id" => "core_users", "order" => 2, "href" => OC_Helper::linkTo( "settings", "users.php" ), "name" => $l->t("Users"), "icon" => OC_Helper::imagePath( "settings", "users.svg" )); // admin apps menu $settings[] = array( "id" => "core_apps", "order" => 3, "href" => OC_Helper::linkTo( "settings", "apps.php" ).'?installed', "name" => $l->t("Apps"), "icon" => OC_Helper::imagePath( "settings", "apps.svg" )); - // admin log menu - $settings[] = array( "id" => "core_log", "order" => 4, "href" => OC_Helper::linkTo( "settings", "log.php" ), "name" => $l->t("Log"), "icon" => OC_Helper::imagePath( "settings", "log.svg" )); $settings[]=array( "id" => "admin", "order" => 1000, "href" => OC_Helper::linkTo( "settings", "admin.php" ), "name" => $l->t("Admin"), "icon" => OC_Helper::imagePath( "settings", "admin.svg" )); } |