From c2e185162d54a9285cde1b44ee690c3dbe53b275 Mon Sep 17 00:00:00 2001
From: YoheiZuho <yuuman002@gmail.com>
Date: Thu, 22 Feb 2024 20:46:00 +0900
Subject: [PATCH] Revert "fix typo"

This reverts commit af41ff0e2b8f0a38aa561f34bf053e6e51df114a.
---
 config/locales/en.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2df8c8dc3..f7951b4de 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -976,6 +976,11 @@ en:
   applications:
     created: Application successfully created
     destroyed: Application successfully deleted
+<<<<<<< HEAD
+=======
+    invalid_regexp: "The provided Regexp is invalid: %{message}"
+    logout: Logout
+>>>>>>> b663df641... Add reject pattern to Admin setting
     regenerate_token: Regenerate access token
     token_regenerated: Access token successfully regenerated
     warning: Be very careful with this data. Never share it with anyone!