godoc/static: resolve merge conflict, committed in error

Browse Source

Change-Id: Ica50edbae03eb1c6efad702841b926ffaf1c98ec
Reviewed-on: https://go-review.googlesource.com/119476
Reviewed-by: Alan Donovan <adonovan@google.com>

...

This commit is contained in:

Alan Donovan 2018-06-18 13:09:27 -04:00

parent e10d6c9a84

commit 53440098a4

1 changed files with 3 additions and 3427 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3430

godoc/static/static.go

View File

File diff suppressed because one or more lines are too long