Skip to content

Commit 8c3afef

Browse files
committed
docs: Regenerate mdoc
1 parent 5ebc278 commit 8c3afef

File tree

3 files changed

+3
-13
lines changed

3 files changed

+3
-13
lines changed

docs/index.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
# Scala Server Toolkit Documentation
22

33
* [Getting Started](#getting-started)
4-
<<<<<<< HEAD
54
* [Rationale](rationale.md)
6-
=======
75
* [Modules JVM](jvm.md)
8-
>>>>>>> feat: Add jvm-execution, jvm-ssl and jvm-system modules
96
* [Module PureConfig](pureconfig.md)
107

118
## Getting Started

docs/jvm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ val program = for {
2323
randomNumber <- systemModule.random.nextInt
2424
_ <- systemModule.console.printLine(s"Current Unix epoch time is $currentTime ms. Random number: $randomNumber")
2525
} yield ()
26-
// program: zio.ZIO[Any, Throwable, Unit] = zio.ZIO$FlatMap@2d237460
26+
// program: zio.ZIO[Any, Throwable, Unit] = zio.ZIO$FlatMap@7f42b194
2727
```
2828

docs/pureconfig.md

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,9 @@ import zio.Task
2020
final case class ServerConfiguration(listenAddress: String, listenPort: Int)
2121

2222
implicit val serverConfigurationReader: ConfigReader[ServerConfiguration] = deriveReader
23-
<<<<<<< HEAD
24-
// serverConfigurationReader: ConfigReader[ServerConfiguration] = pureconfig.generic.DerivedConfigReader1$$anon$3@3c04ddda
23+
// serverConfigurationReader: ConfigReader[ServerConfiguration] = pureconfig.generic.DerivedConfigReader1$$anon$3@1a9e2c3b
2524

2625
val maybeConfiguration = PureConfigModule.make[Task, ServerConfiguration]
27-
// maybeConfiguration: Task[Either[cats.data.NonEmptyList[String], ServerConfiguration]] = zio.ZIO$EffectPartial@47b494ce
28-
=======
29-
// serverConfigurationReader: ConfigReader[ServerConfiguration] = pureconfig.generic.DerivedConfigReader1$$anon$3@3e7940b3
30-
31-
val maybeConfiguration = PureConfigModule.make[Task, ServerConfiguration]
32-
// maybeConfiguration: Task[Either[cats.data.NonEmptyList[String], ServerConfiguration]] = zio.ZIO$EffectPartial@1ae37be2
33-
>>>>>>> feat: Add jvm-execution, jvm-ssl and jvm-system modules
26+
// maybeConfiguration: Task[Either[cats.data.NonEmptyList[String], ServerConfiguration]] = zio.ZIO$EffectPartial@5f92e5eb
3427
```
3528

0 commit comments

Comments
 (0)