Cemal
/
QualiNomme
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge fix

main
Cemal Odabasioglu 2023-12-07 14:38:38 +01:00
parent 9181deaa03
commit 4b44267bda
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/kotlin/main/Main.kt
View File

@ -22,14 +22,10 @@ import java.awt.Frame
import java.io.File import java.io.File
import java.io.FileWriter import java.io.FileWriter
import java.io.IOException import java.io.IOException
<<<<<<< src/main/kotlin/main/Main.kt
=======
import org.apache.poi.ss.usermodel.CellType import org.apache.poi.ss.usermodel.CellType
import org.apache.poi.ss.usermodel.Workbook import org.apache.poi.ss.usermodel.Workbook
import org.apache.poi.xssf.usermodel.XSSFWorkbook import org.apache.poi.xssf.usermodel.XSSFWorkbook
import java.io.FileInputStream import java.io.FileInputStream
>>>>>>> src/main/kotlin/main/Main.kt
val customRedColor = Color(0xFFB70D1B) val customRedColor = Color(0xFFB70D1B)
@ -498,11 +494,8 @@ fun glossairePage(
} }
<<<<<<< src/main/kotlin/main/Main.kt
@OptIn(ExperimentalMaterialApi::class) @OptIn(ExperimentalMaterialApi::class)
=======
>>>>>>> src/main/kotlin/main/Main.kt
@Composable @Composable
fun formulairePage(onAnnulerClick: () -> Unit) { fun formulairePage(onAnnulerClick: () -> Unit) {
// State to track whether to show the snackbar // State to track whether to show the snackbar