Skip to content

Commit bd7b9e8

Browse files
drewngyendrewngyen
committed
whoa merge confglicts
2 parents d3c21fa + a83d5ad commit bd7b9e8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+7274
-1
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ node_modules
1010
npm-debug.log*
1111
yarn-debug.log*
1212
yarn-error.log*
13+
/test/jest/coverage
1314

1415
# Editor directories and files
1516
.idea

‎coverage/index.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,11 @@ <h1>
6767
</div><!-- /wrapper -->
6868
<div class='footer quiet pad2 space-top1 center small'>
6969
Code coverage
70+
<<<<<<< HEAD:coverage/index.html
7071
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Sat Jul 13 2019 13:34:49 GMT-0700 (Pacific Daylight Time)
72+
=======
73+
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Jul 15 2019 14:22:10 GMT-0700 (Pacific Daylight Time)
74+
>>>>>>> a83d5ad3e268f96c335a7ee21e31c49db06cb8cf:test/jest/coverage/lcov-report/src/pages/index.html
7175
</div>
7276
</div>
7377
<script src="prettify.js"></script>

‎coverage/prevue2/babel.config.js.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,11 @@ <h1>
6767
</div><!-- /wrapper -->
6868
<div class='footer quiet pad2 space-top1 center small'>
6969
Code coverage
70+
<<<<<<< HEAD:coverage/prevue2/babel.config.js.html
7071
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Sat Jul 13 2019 13:11:25 GMT-0700 (Pacific Daylight Time)
72+
=======
73+
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Jul 15 2019 14:22:10 GMT-0700 (Pacific Daylight Time)
74+
>>>>>>> a83d5ad3e268f96c335a7ee21e31c49db06cb8cf:test/jest/coverage/lcov-report/src-pwa/custom-service-worker.js.html
7175
</div>
7276
</div>
7377
<script src="../prettify.js"></script>

‎coverage/prevue2/coverage/block-navigation.js.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,11 @@ <h1>
289289
</div><!-- /wrapper -->
290290
<div class='footer quiet pad2 space-top1 center small'>
291291
Code coverage
292+
<<<<<<< HEAD:coverage/prevue2/coverage/block-navigation.js.html
292293
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Sat Jul 13 2019 13:11:25 GMT-0700 (Pacific Daylight Time)
294+
=======
295+
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Jul 15 2019 14:22:10 GMT-0700 (Pacific Daylight Time)
296+
>>>>>>> a83d5ad3e268f96c335a7ee21e31c49db06cb8cf:test/jest/coverage/lcov-report/src/components/Tree.vue.html
293297
</div>
294298
</div>
295299
<script src="../../prettify.js"></script>

‎coverage/prevue2/index.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,11 @@ <h1>
9393
</div><!-- /wrapper -->
9494
<div class='footer quiet pad2 space-top1 center small'>
9595
Code coverage
96+
<<<<<<< HEAD:coverage/prevue2/index.html
9697
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Sat Jul 13 2019 13:11:25 GMT-0700 (Pacific Daylight Time)
98+
=======
99+
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Jul 15 2019 14:22:10 GMT-0700 (Pacific Daylight Time)
100+
>>>>>>> a83d5ad3e268f96c335a7ee21e31c49db06cb8cf:test/jest/coverage/lcov-report/src-pwa/index.html
97101
</div>
98102
</div>
99103
<script src="../prettify.js"></script>

‎coverage/prevue2/quasar.conf.js.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,11 @@ <h1>
613613
</div><!-- /wrapper -->
614614
<div class='footer quiet pad2 space-top1 center small'>
615615
Code coverage
616+
<<<<<<< HEAD:coverage/prevue2/quasar.conf.js.html
616617
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Sat Jul 13 2019 13:11:25 GMT-0700 (Pacific Daylight Time)
618+
=======
619+
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Jul 15 2019 14:22:10 GMT-0700 (Pacific Daylight Time)
620+
>>>>>>> a83d5ad3e268f96c335a7ee21e31c49db06cb8cf:test/jest/coverage/lcov-report/src/components/Footer.vue.html
617621
</div>
618622
</div>
619623
<script src="../prettify.js"></script>

‎coverage/prevue2/src-electron/main-process/electron-main.dev.js.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,11 @@ <h1>
118118
</div><!-- /wrapper -->
119119
<div class='footer quiet pad2 space-top1 center small'>
120120
Code coverage
121+
<<<<<<< HEAD:coverage/prevue2/src-electron/main-process/electron-main.dev.js.html
121122
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Sat Jul 13 2019 13:11:25 GMT-0700 (Pacific Daylight Time)
123+
=======
124+
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Jul 15 2019 14:22:10 GMT-0700 (Pacific Daylight Time)
125+
>>>>>>> a83d5ad3e268f96c335a7ee21e31c49db06cb8cf:test/jest/coverage/lcov-report/src-electron/main-process/electron-main.dev.js.html
122126
</div>
123127
</div>
124128
<script src="../../../prettify.js"></script>

‎coverage/prevue2/src-electron/main-process/electron-main.js.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,11 @@ <h1>
187187
</div><!-- /wrapper -->
188188
<div class='footer quiet pad2 space-top1 center small'>
189189
Code coverage
190+
<<<<<<< HEAD:coverage/prevue2/src-electron/main-process/electron-main.js.html
190191
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Sat Jul 13 2019 13:11:25 GMT-0700 (Pacific Daylight Time)
192+
=======
193+
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Jul 15 2019 14:22:10 GMT-0700 (Pacific Daylight Time)
194+
>>>>>>> a83d5ad3e268f96c335a7ee21e31c49db06cb8cf:test/jest/coverage/lcov-report/src-electron/main-process/electron-main.js.html
191195
</div>
192196
</div>
193197
<script src="../../../prettify.js"></script>

‎coverage/prevue2/src-electron/main-process/index.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,11 @@ <h1>
9393
</div><!-- /wrapper -->
9494
<div class='footer quiet pad2 space-top1 center small'>
9595
Code coverage
96+
<<<<<<< HEAD:coverage/prevue2/src-electron/main-process/index.html
9697
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Sat Jul 13 2019 13:11:25 GMT-0700 (Pacific Daylight Time)
98+
=======
99+
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Jul 15 2019 14:22:10 GMT-0700 (Pacific Daylight Time)
100+
>>>>>>> a83d5ad3e268f96c335a7ee21e31c49db06cb8cf:test/jest/coverage/lcov-report/src-electron/main-process/index.html
97101
</div>
98102
</div>
99103
<script src="../../../prettify.js"></script>

‎coverage/prevue2/src/router/index.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,11 @@ <h1>
9393
</div><!-- /wrapper -->
9494
<div class='footer quiet pad2 space-top1 center small'>
9595
Code coverage
96+
<<<<<<< HEAD:coverage/prevue2/src/router/index.html
9697
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Sat Jul 13 2019 13:11:25 GMT-0700 (Pacific Daylight Time)
98+
=======
99+
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Jul 15 2019 14:22:10 GMT-0700 (Pacific Daylight Time)
100+
>>>>>>> a83d5ad3e268f96c335a7ee21e31c49db06cb8cf:test/jest/coverage/lcov-report/src/router/index.html
97101
</div>
98102
</div>
99103
<script src="../../../prettify.js"></script>

0 commit comments

Comments
 (0)