Merge pull request #657 from saiwing-yeung/master

Fix typo
jupyter · Mar 24, 2023 · 9fbfd46 · 9fbfd46
2 parents 50c9347 + d5a3a48
commit 9fbfd46
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/nbdime/nbmergeapp.py b/nbdime/nbmergeapp.py
@@ -52,7 +52,7 @@ def main_merge(args):
     returncode = 1 if conflicted else 0
 
     if conflicted:
-        logger.warning("Conflicts occured during merge operation.")
+        logger.warning("Conflicts occurred during merge operation.")
     else:
         logger.debug("Merge completed successfully with no unresolvable conflicts.")