googleapis
diff --git a/‎handwritten/error-reporting/.kokoro/common.cfg‎
Lines changed: 0 additions & 161 deletions b/‎handwritten/error-reporting/.kokoro/common.cfg‎
Lines changed: 0 additions & 161 deletions
diff --git a/‎handwritten/error-reporting/owlbot.py‎
Lines changed: 1 addition & 1 deletion b/‎handwritten/error-reporting/owlbot.py‎
Lines changed: 1 addition & 1 deletion
@@ -34,7 +34,7 @@
 s.move(
     "handwritten/error-reporting/.kokoro/common_env_vars.cfg",
     "handwritten/error-reporting/.kokoro/common.cfg",
-    merge=lambda src, dst, _, : f"{dst}\n{src}",
+    merge=lambda src, dst, _: dst if src.strip() in dst else f"{dst.rstrip()}\n{src.strip()}\n",
 )
 for path, subdirs, files in os.walk(f"handwritten/error-reporting/.kokoro/continuous"):
     for name in files:
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`s.move(`
`35`	`35`	`"handwritten/error-reporting/.kokoro/common_env_vars.cfg",`
`36`	`36`	`"handwritten/error-reporting/.kokoro/common.cfg",`
`37`		`- merge=lambda src, dst, _, : f"{dst}\n{src}",`
	`37`	`+ merge=lambda src, dst, _: dst if src.strip() in dst else f"{dst.rstrip()}\n{src.strip()}\n",`
`38`	`38`	`)`
`39`	`39`	`for path, subdirs, files in os.walk(f"handwritten/error-reporting/.kokoro/continuous"):`
`40`	`40`	`for name in files:`