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 /lib/public/template.php | |
| parent | d0b625352cc8acc160e22cb2f4e9ae8e10f753f6 (diff) | |
| parent | 0f0aa1827f446ca531732bb1c807c244ef66676a (diff) | |
| download | nextcloud-server-0cb9f5e159b1588550830dda4b21010a0412bae9.tar.gz nextcloud-server-0cb9f5e159b1588550830dda4b21010a0412bae9.zip | |
fix merge conflicts
Diffstat (limited to 'lib/public/template.php')
| -rw-r--r-- | lib/public/template.php | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/public/template.php b/lib/public/template.php index b89088bdd06..a0ed618cb2c 100644 --- a/lib/public/template.php +++ b/lib/public/template.php @@ -104,6 +104,3 @@ function html_select_options($options, $selected, $params=array()) { class Template extends \OC_Template { } - - -?> |