diff options
author | Alessandro Cosentino <cosenal@gmail.com> | 2012-08-11 12:28:45 -0400 |
---|---|---|
committer | Alessandro Cosentino <cosenal@gmail.com> | 2012-08-11 12:28:45 -0400 |
commit | 14683ee6f1381004193621d00a4ece3737bc80a4 (patch) | |
tree | 7577e3c5e4ecea18ecf5585805d1deaa2eae2260 /templates/part.folderlist.php | |
parent | 3443468538567c2cd23dc43b101b284c6af1a2e8 (diff) | |
parent | 07ae82b108e39efea7081d1e0a4160a85591a72b (diff) |
fix conflicts of merge
Diffstat (limited to 'templates/part.folderlist.php')
-rw-r--r-- | templates/part.folderlist.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/templates/part.folderlist.php b/templates/part.folderlist.php index 972b60143..11ed53bcb 100644 --- a/templates/part.folderlist.php +++ b/templates/part.folderlist.php @@ -1,4 +1,5 @@ <?php + function print_folder(OCA\News\Folder $folder, $depth){ echo '<li style="margin-left:' . 10*$depth . 'px;" class="menuItem" onclick="News.DropDownMenu.selectItem(this, ' . $folder->getId() . ')">' . $folder->getName() . '</li>'; $children = $folder->getChildren(); |