finatra: Fix bad merge in build.sbt
finatra: Fix bad merge in build.sbt

Problem

A bad merge of two branches has created an error in the build.sbt

Solution

Fix the bad merge.

Result

Code builds.

RB_ID=834946
TBR=true

twitter/finatra,syamantm/finatra,twitter/finatra,syamantm/finatra,twitter/finatra,syamantm/finatra,syamantm/finatra