merge fix

assets/langs/ar-SA.json

@@ -497,8 +497,6 @@
   "otp": "OTP",
   "verification": "تَحَقّق",
   "resend": "إعادة إرسال",
-  "codeExpire": "انتهت صلاحية رمز التحقق"
+  "codeExpire": "انتهت صلاحية رمز التحقق",
-
-  "allQuestionsCorrect": "لقد أجبت على جميع الأسئلة بشكل صحيح.",
   "typeheretoreply": "اكتب هنا للرد"
 }

assets/langs/en-US.json

@@ -493,11 +493,10 @@
   "winnerSelectedRandomly": "The winner will be selected randomly among the qualifiers.",
   "fingersCrossed": "Fingers Crossed!!!",
   "congrats": "Congratulations!!!",
-  "allQuestionsCorrect": "You have answered all questions correct",
   "otp": "OTP",
   "verification": "Verification",
   "resend": "Resend",
-  "codeExpire": "The verification code has been expired"
+  "codeExpire": "The verification code has been expired",
   "allQuestionsCorrect": "You have answered all questions correct",
   "typeheretoreply": "Type here to reply"
 }

lib/generated/codegen_loader.g.dart

@@ -513,7 +513,8 @@ class CodegenLoader extends AssetLoader{
   "otp": "OTP",
   "verification": "تَحَقّق",
   "resend": "إعادة إرسال",
-  "codeExpire": "انتهت صلاحية رمز التحقق"
+  "codeExpire": "انتهت صلاحية رمز التحقق",
+  "typeheretoreply": "اكتب هنا للرد"
 };
 static const Map<String,dynamic> en_US = {
   "mohemm": "Mohemm",
@@ -1010,11 +1011,12 @@ static const Map<String,dynamic> en_US = {
   "winnerSelectedRandomly": "The winner will be selected randomly among the qualifiers.",
   "fingersCrossed": "Fingers Crossed!!!",
   "congrats": "Congratulations!!!",
-  "allQuestionsCorrect": "You have answered all questions correct",
   "otp": "OTP",
   "verification": "Verification",
   "resend": "Resend",
-  "codeExpire": "The verification code has been expired"
+  "codeExpire": "The verification code has been expired",
+  "allQuestionsCorrect": "You have answered all questions correct",
+  "typeheretoreply": "Type here to reply"
 };
 static const Map<String, Map<String,dynamic>> mapLocales = {"ar_SA": ar_SA, "en_US": en_US};
 }

lib/generated/locale_keys.g.dart

@@ -484,5 +484,6 @@ abstract class  LocaleKeys {
   static const verification = 'verification';
   static const resend = 'resend';
   static const codeExpire = 'codeExpire';
+  static const typeheretoreply = 'typeheretoreply';
 
 }