Skip to content

Commit e9a8f43

Browse files
committed
fix error after solving conflict
1 parent e297f09 commit e9a8f43

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

Gemfile.lock

+3
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,8 @@ GEM
233233
mutex_m (0.2.0)
234234
net-http (0.4.1)
235235
uri
236+
nokogiri (1.16.5-aarch64-linux)
237+
racc (~> 1.4)
236238
nokogiri (1.16.5-arm64-darwin)
237239
racc (~> 1.4)
238240
nokogiri (1.16.5-x64-mingw-ucrt)
@@ -285,6 +287,7 @@ GEM
285287
zeitwerk (2.6.7)
286288

287289
PLATFORMS
290+
aarch64-linux
288291
arm64-darwin-22
289292
arm64-darwin-23
290293
x64-mingw-ucrt

_th/tour/traits.md

+2-8
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ language: th
99

1010
next-page: tuples
1111
previous-page: classes
12+
topics: traits
13+
prerequisite-knowledge: expressions, classes, generics, objects, companion-objects
1214
---
1315

1416
Trait ใช้เพื่อแชร์ interface และ field ระหว่างคลาส โดยที่ trait จะคล้ายกับ interface ใน Java 8\
@@ -148,14 +150,6 @@ iterator.next() // returns 1
148150
149151
{% tab 'Scala 2' for=trait-pet-example %}
150152
151-
{% tabs trait-pet-example class=tabs-scala-version %}
152-
153-
{% tab 'Scala 2' for=trait-pet-example %}
154-
155-
{% tabs trait-pet-example class=tabs-scala-version %}
156-
157-
{% tab 'Scala 2' for=trait-pet-example %}
158-
159153
```scala mdoc
160154
import scala.collection.mutable.ArrayBuffer
161155

0 commit comments

Comments
 (0)