Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add disable/enable calculation of items in group (2) #6244
Add disable/enable calculation of items in group (2) #6244
Changes from 1 commit
72c022e
1f4e4ad
ebd6284
c0990dc
1b5d16d
f6c12f4
3f368e9
c8da256
ce33357
3df1342
5454a09
e066958
40541ad
9287490
d4f23fa
b1e899a
a9eeb05
7748940
c8344be
dffcf78
2c1a69e
9882c6d
e277c0c
e76a92c
03e3663
3e96170
737af75
2a5717c
ab50ca8
cb6804e
fa5f879
c8949bd
ead191e
8d468cb
4f75f57
196f937
20c70a9
7d3bd7b
59361fc
43262c3
bc1e341
d01f370
b86800c
0bd2fd2
25bd506
6f34de3
86b04a7
0d7156b
861e61e
56b0cee
104f697
bb19d29
47846bf
c119ca2
4b997f8
5668049
62a6961
08eccb6
62f3038
3135197
526ba89
0ce7c8f
6a1940f
ffa07cd
d43bcfa
c1867e5
41678ce
ad8ac9d
4eb2316
cab28ab
8ff20f1
a852963
5cb139c
8b35b69
2c30f20
9742ee1
53e8c36
68f90c0
684abf6
58e5492
2155917
30cb675
5c1998f
2da0d06
File filter
Filter by extension
Conversations
Jump to
There are no files selected for viewing
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this duplication of the code is a result from a merge conflict?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like yes, this is a conflict.
the second
BackgroundTask
is not mine. My code is:There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, I haven't worked with conflicts yet.
Looks like this is your correction as of 11.04.2020. Can I do something to resolve this GIT conflict?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No problem! I also often have problems with git ;-)
Here the solution is relatively simple. Just edit the code and remove the part that is duplicated / not correct. Then commit and push.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please leave this if check here, otherwise every group will have a
0
here.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good day,
OK, adjusted in code. Will commit today, when we find solution about PreferencesService in GroupNodeViewModel (see comment from calixtus).