Skip to content

Commit

Permalink
fix bad merge
Browse files Browse the repository at this point in the history
  • Loading branch information
mwachs5 committed Mar 12, 2020
1 parent 2be8a2e commit 3b1a2a8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/main/scala/tilelink/Parameters.scala
Original file line number Diff line number Diff line change
Expand Up @@ -570,6 +570,8 @@ class TLSlavePortParameters private(
})
}

def infoString = "Manager Port Beatbytes = " + beatBytes + "\n" + "Manager Port MinLatency = " + minLatency + "\n\n" + managers.map(_.infoString).mkString

def v1copy(
managers: Seq[TLSlaveParameters] = slaves,
beatBytes: Int = -1,
Expand Down Expand Up @@ -635,8 +637,6 @@ object TLSlavePortParameters {
minLatency = minLatency)
}

def infoString = "Manager Port Beatbytes = " + beatBytes + "\n" + "Manager Port MinLatency = " + minLatency + "\n\n" + managers.map(_.infoString).mkString

}

object TLManagerPortParameters {
Expand Down

0 comments on commit 3b1a2a8

Please sign in to comment.