[container] fix merge errors (ad6d09c6) · Commits · ag-ohlberger / dune-community / dune-xt · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dune-xt
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

ad6d09c6

Commit ad6d09c6 authored 6 years ago by Tobias Leibner

Downloads
- Patches
- Plain Diff

[container] fix merge errors

parent efabd8b7

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

.gitsuper 2 additions, 2 deletions

.gitsuper
dune/xt/la/algorithms/qr.hh 0 additions, 1 deletion

dune/xt/la/algorithms/qr.hh
dune/xt/la/container/eigen/dense.hh 3 additions, 4 deletions

dune/xt/la/container/eigen/dense.hh
dune/xt/la/container/eigen/sparse.hh 17 additions, 22 deletions

dune/xt/la/container/eigen/sparse.hh
dune/xt/la/solver.hh 7 additions, 7 deletions

dune/xt/la/solver.hh

with 29 additions and 36 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment