Skip to content

Commit 601ad51

Browse files
pfaffeDevtools-frontend LUCI CQ
authored and
Devtools-frontend LUCI CQ
committed
Use union merge algorithm for KnowContextValues.ts
This file is auto-generated by a lint-rule, so avoid merge conflicts if possible. Bug: none Change-Id: I9b38555f0d5fe14a3d7bb02d36eb08e76a149f0f Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/5766559 Reviewed-by: Danil Somsikov <[email protected]> Commit-Queue: Philip Pfaffe <[email protected]>
1 parent f554ff5 commit 601ad51

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

.gitattributes

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
package-lock.json binary
2+
front_end/ui/visual_logging/KnownContextValues.ts merge=union
23
# Automatically normalize line endings (to LF) for all text-based files.
3-
* text=auto eol=lf
4+
* text=auto eol=lf

0 commit comments

Comments
 (0)