mirror of
https://github.com/apache/zeppelin
synced 2026-05-24 09:38:26 +00:00
resolve conflict
This commit is contained in:
parent
55b7ddc254
commit
028f873a45
1 changed files with 1 additions and 0 deletions
|
|
@ -150,6 +150,7 @@ limitations under the License.
|
|||
<div ng-if="!query.q || query.q === ''">
|
||||
<li ng-repeat="node in home.notes.root.children | orderBy:home.arrayOrderingSrv.noteListOrdering track by $index"
|
||||
ng-include="'note_renderer.html'"></li>
|
||||
</div>
|
||||
<div ng-if="query.q">
|
||||
<li ng-repeat="node in home.notes.flatList| filter:query.q | orderBy:home.arrayOrderingSrv.noteListOrdering track by $index"
|
||||
ng-include="'note_renderer.html'"></li>
|
||||
|
|
|
|||
Loading…
Reference in a new issue