fix error after solving conflict

scala · Nov 1, 2024 · e9a8f43 · e9a8f43
1 parent e297f09
commit e9a8f43
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -233,6 +233,8 @@ GEM
     mutex_m (0.2.0)
     net-http (0.4.1)
       uri
+    nokogiri (1.16.5-aarch64-linux)
+      racc (~> 1.4)
     nokogiri (1.16.5-arm64-darwin)
       racc (~> 1.4)
     nokogiri (1.16.5-x64-mingw-ucrt)
@@ -285,6 +287,7 @@ GEM
     zeitwerk (2.6.7)
 
 PLATFORMS
+  aarch64-linux
   arm64-darwin-22
   arm64-darwin-23
   x64-mingw-ucrt

diff --git a/_th/tour/traits.md b/_th/tour/traits.md
@@ -9,6 +9,8 @@ language: th
 
 next-page: tuples
 previous-page: classes
+topics: traits
+prerequisite-knowledge: expressions, classes, generics, objects, companion-objects
 ---
 
 Trait ใช้เพื่อแชร์ interface และ field ระหว่างคลาส โดยที่ trait จะคล้ายกับ interface ใน Java 8\
@@ -148,14 +150,6 @@ iterator.next()  // returns 1
 
 {% tab 'Scala 2' for=trait-pet-example %}
 
-{% tabs trait-pet-example class=tabs-scala-version %}
-
-{% tab 'Scala 2' for=trait-pet-example %}
-
-{% tabs trait-pet-example class=tabs-scala-version %}
-
-{% tab 'Scala 2' for=trait-pet-example %}
-
 ```scala mdoc
 import scala.collection.mutable.ArrayBuffer