Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

Molstar
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

5d9b93fe

Commit 5d9b93fe authored 6 years ago by luna215

Downloads
- Patches
- Plain Diff

Resolving merge conflict

parent 6cf6740a

No related branches found

No related tags found

Loading

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

src/mol-geo/geometry/direct-volume/direct-volume.ts 1 addition, 1 deletion

src/mol-geo/geometry/direct-volume/direct-volume.ts
src/mol-plugin/ui/controls/parameters.tsx 0 additions, 1 deletion

src/mol-plugin/ui/controls/parameters.tsx

with 1 addition and 2 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