Code

Style conflict resolution page#199

Code

Merged

Tyler-Brenneman merged 7 commits intomastermattyu007/ProjectOrange:masterfrom client/styleConflictmattyu007/ProjectOrange:client/styleConflictCopy head branch name to clipboardMar 28, 2017

+294-119

Commits

Commits on Mar 28, 2017

• initial commit

  Tyler-Brenneman

  committed
  f178f52

  Copy full SHA for f178f52

• Handle flagging deleted cards + matt's suggestions

  Tyler-Brenneman

  committed
  98bc96c

  Copy full SHA for 98bc96c

• change cancle name

  Tyler-Brenneman

  committed
  5d45d42

  Copy full SHA for 5d45d42

• fix spacing

  Tyler-Brenneman

  committed
  2162a7c

  Copy full SHA for 2162a7c

• flexy

  Tyler-Brenneman

  committed
  013cf19

  Copy full SHA for 013cf19

• fix edit deleted deck

  Tyler-Brenneman

  committed
  fe45b5b

  Copy full SHA for fe45b5b

• removeClippedSubviews

  Tyler-Brenneman

  committed
  3e0b403

  Copy full SHA for 3e0b403