Build to kill merge conflicts

primer · Jul 10, 2016 · 521fe0a · 521fe0a
1 parent d2e5eed
commit 521fe0a
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 12 deletions.
diff --git a/build/font/octicons.eot b/build/font/octicons.eot
diff --git a/build/font/octicons.min.css b/build/font/octicons.min.css
diff --git a/build/font/octicons.svg b/build/font/octicons.svg
diff --git a/build/font/octicons.ttf b/build/font/octicons.ttf
diff --git a/build/font/octicons.woff b/build/font/octicons.woff
diff --git a/build/font/octicons.woff2 b/build/font/octicons.woff2