PWV-1: Fixing merging issues

This commit is contained in:
Bruno Alves de Faria authored and Erik Ziegler committed 2016-11-15 08:24:30 +01:00
1 parent 481bf30a14
commit db0602def7
29 files changed
+392 -488

No files matched your search

@@ -1,6 +1,6 @@
<template name="studylistResult">
<div class="studyListToolbar">
<div class="header">
<div class="studyListToolbar clearfix">
<div class="header pull-left">
Study list
</div>
<div class="studyCount pull-right">
@@ -104,4 +104,4 @@
{{/unless}}
{{/if}}
</div>
</template>
</template>