[operators] fix merge errors
parent
f9f4d358
No related branches found
No related tags found
Checking pipeline status
Showing
- .gitignore 2 additions, 0 deletions.gitignore
- dune/gdt/local/integrands/generic.hh 1 addition, 1 deletiondune/gdt/local/integrands/generic.hh
- dune/gdt/local/operators/advection-dg.hh 64 additions, 10 deletionsdune/gdt/local/operators/advection-dg.hh
- dune/gdt/local/operators/advection-fv.hh 28 additions, 0 deletionsdune/gdt/local/operators/advection-fv.hh
- dune/gdt/local/operators/interfaces.hh 14 additions, 0 deletionsdune/gdt/local/operators/interfaces.hh
- dune/gdt/operators/interfaces.hh 2 additions, 0 deletionsdune/gdt/operators/interfaces.hh
- dune/gdt/operators/localizable-operator.hh 41 additions, 12 deletionsdune/gdt/operators/localizable-operator.hh
Loading