Skip to content
GitLab
Projects Groups Topics Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Sign in
  • E ensembl-io
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
    • Locked files
  • Issues 0
    • Issues 0
    • List
    • Boards
    • Service Desk
    • Milestones
    • Iterations
    • Requirements
  • Jira
    • Jira
  • Merge requests 0
    • Merge requests 0
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
    • Test cases
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Package Registry
    • Container Registry
    • Terraform modules
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Code review
    • Insights
    • Issue
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • ensembl-gh-mirror
  • ensembl-io
  • Merge requests
  • !59

Unification merge conflict

  • Review changes

  • Download
  • Patches
  • Plain diff
Closed Marek Szuba requested to merge unified-unification into master Jun 07, 2018
  • Overview 12
  • Commits 176
  • Pipelines 0
  • Changes 300

Created by: tgrego

Do not merge!

This branch is a merge of master and feature/unified-design branches, that have diverged... Apparently both branches are used in different places, so the merge has to be correct for master to become the only branch used.

Some minor fixes added.

Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: unified-unification