Resolving conflict of the file nb

AshutoshKhadse23 · web-flow · commit f37d72bc7edd · 2025-01-18T20:11:20.000+05:30
diff --git a/lib/generated/l10n/zulip_localizations_nb.dart b/lib/generated/l10n/zulip_localizations_nb.dart
@@ -537,7 +537,4 @@ class ZulipLocalizationsNb extends ZulipLocalizations {
 
   @override
   String get emojiPickerSearchEmoji => 'Search emoji';
-
-  @override
-  String get composeBoxAttachGlobalTimeTooltip => 'Attach a global time';
 }

Original file line number	Diff line number	Diff line change
`@@ -537,7 +537,4 @@ class ZulipLocalizationsNb extends ZulipLocalizations {`
`537`	`537`
`538`	`538`	`@override`
`539`	`539`	`String get emojiPickerSearchEmoji => 'Search emoji';`
`540`		`-`
`541`		`- @override`
`542`		`- String get composeBoxAttachGlobalTimeTooltip => 'Attach a global time';`
`543`	`540`	`}`