Code

Reject conflicts on accepting claim.#407

Code

Open

prathambatra wants to merge 4 commits intocoding-blocks:mastercoding-blocks/boss:masterfrom prathambatra:reject-conflictsprathambatra/boss:reject-conflictsCopy head branch name to clipboard

+68-10

Commits

Commits on Jun 8, 2020

• Replaced claim with claimId in getConflictedClaims

  Show description for 2b95555
  prathambatra

  committed
  2b95555

Commits on Jun 10, 2020

• added reject-conflict controller

  Show description for 3795784
  prathambatra

  committed
  3795784

Commits on Jun 11, 2020

• Reject conflicts working

  Show description for 012f91a
  prathambatra

  committed
  012f91a

• Merge branch 'master' of https://github.com/coding-blocks/boss into reject-conflicts

  Show description for c2190d4
  prathambatra

  committed
  c2190d4