mirror of
https://github.com/librecaptcha/lc-core.git
synced 2025-01-27 13:03:12 -05:00
Merge branch 'BT-captcha' of github.com:rr83019/lc-core into BT-captcha
This commit is contained in:
commit
aa5e7da0bc
@ -35,11 +35,15 @@ class BackgroundTask(throttle: Int, timeLimit: Int) {
|
||||
val media = pickRandom(captcha.allowedMedia)
|
||||
val inputType = pickRandom(captcha.allowedInputType)
|
||||
|
||||
<<<<<<< HEAD
|
||||
Parameters(level, media, inputType, Some(Size(0, 0)))
|
||||
}
|
||||
|
||||
private def pickRandom[T](list: List[T]): T = {
|
||||
list(Config.getNextRandomInt(list.size))
|
||||
=======
|
||||
Parameters(level, media, inputType, Some(Size(0,0)))
|
||||
>>>>>>> 8f0f29c579087846784922959337e2a25c11b617
|
||||
}
|
||||
|
||||
def beginThread(delay: Int): Unit = {
|
||||
|
Loading…
x
Reference in New Issue
Block a user