From 2b866941cc2886df64a13a3a642fc80358a7a50b Mon Sep 17 00:00:00 2001
From: felixmielcarek <felix.mielcarek@etu.uca.fr>
Date: Sun, 30 Oct 2022 19:27:06 +0100
Subject: [PATCH] Apply merge

---
 .../dafl_project_flutter/lib/views/pages/home/p_home.dart  | 7 +++++--
 .../lib/views/pages/sign_up/p_sign_up.dart                 | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Sources/dafl_project_flutter/lib/views/pages/home/p_home.dart b/Sources/dafl_project_flutter/lib/views/pages/home/p_home.dart
index 5b3aa76..536f67a 100644
--- a/Sources/dafl_project_flutter/lib/views/pages/home/p_home.dart
+++ b/Sources/dafl_project_flutter/lib/views/pages/home/p_home.dart
@@ -60,7 +60,9 @@ class _HomePageState extends State<HomePage> {
               SizedBox(
                 height: height * 0.015,
               ),
-              SizedBox(height: height*0.08,),
+              SizedBox(
+                height: height * 0.08,
+              ),
               SizedBox(
                 height: 55,
                 width: width * 0.75,
@@ -89,7 +91,8 @@ class _HomePageState extends State<HomePage> {
                         fontWeight: FontWeight.bold),
                     textAlign: TextAlign.center,
                   ),
-                ),),
+                ),
+              ),
               Spacer(),
               GestureDetector(
                 onTap: () {
diff --git a/Sources/dafl_project_flutter/lib/views/pages/sign_up/p_sign_up.dart b/Sources/dafl_project_flutter/lib/views/pages/sign_up/p_sign_up.dart
index a601a14..8c017be 100644
--- a/Sources/dafl_project_flutter/lib/views/pages/sign_up/p_sign_up.dart
+++ b/Sources/dafl_project_flutter/lib/views/pages/sign_up/p_sign_up.dart
@@ -267,7 +267,7 @@ class _SignUpPageState extends State<SignUpPage> {
                             child: HomePage()),
                       );
                     },
-                    child:Ink(
+                    child: Ink(
                       child: Align(
                         alignment: Alignment.center,
                         child: Icon(