fixing conflicts

canonical-web-and-design · Sep 16, 2016 · f1c0b92 · f1c0b92
2 parents b86bc4e + 09a2041
commit f1c0b92
Show file tree

Hide file tree

Showing 95 changed files with 76 additions and 11,389 deletions.
diff --git a/assets/fonts/ubuntu-b-webfont.eot b/assets/fonts/ubuntu-b-webfont.eot
diff --git a/assets/fonts/ubuntu-b-webfont.svg b/assets/fonts/ubuntu-b-webfont.svg
diff --git a/assets/fonts/ubuntu-b-webfont.ttf b/assets/fonts/ubuntu-b-webfont.ttf
diff --git a/assets/fonts/ubuntu-b-webfont.woff b/assets/fonts/ubuntu-b-webfont.woff
diff --git a/assets/fonts/ubuntu-l-webfont.eot b/assets/fonts/ubuntu-l-webfont.eot
diff --git a/assets/fonts/ubuntu-l-webfont.svg b/assets/fonts/ubuntu-l-webfont.svg
diff --git a/assets/fonts/ubuntu-l-webfont.ttf b/assets/fonts/ubuntu-l-webfont.ttf
diff --git a/assets/fonts/ubuntu-l-webfont.woff b/assets/fonts/ubuntu-l-webfont.woff
diff --git a/assets/fonts/ubuntu-l-webfont.woff2 b/assets/fonts/ubuntu-l-webfont.woff2
diff --git a/assets/fonts/ubuntu-li-webfont.eot b/assets/fonts/ubuntu-li-webfont.eot
diff --git a/assets/fonts/ubuntu-li-webfont.svg b/assets/fonts/ubuntu-li-webfont.svg
diff --git a/assets/fonts/ubuntu-li-webfont.ttf b/assets/fonts/ubuntu-li-webfont.ttf
diff --git a/assets/fonts/ubuntu-li-webfont.woff b/assets/fonts/ubuntu-li-webfont.woff
diff --git a/assets/fonts/ubuntu-m-webfont.eot b/assets/fonts/ubuntu-m-webfont.eot
diff --git a/assets/fonts/ubuntu-m-webfont.svg b/assets/fonts/ubuntu-m-webfont.svg
diff --git a/assets/fonts/ubuntu-m-webfont.ttf b/assets/fonts/ubuntu-m-webfont.ttf
diff --git a/assets/fonts/ubuntu-m-webfont.woff b/assets/fonts/ubuntu-m-webfont.woff
diff --git a/assets/fonts/ubuntu-mi-webfont.eot b/assets/fonts/ubuntu-mi-webfont.eot
diff --git a/assets/fonts/ubuntu-mi-webfont.svg b/assets/fonts/ubuntu-mi-webfont.svg
diff --git a/assets/fonts/ubuntu-mi-webfont.ttf b/assets/fonts/ubuntu-mi-webfont.ttf
diff --git a/assets/fonts/ubuntu-mi-webfont.woff b/assets/fonts/ubuntu-mi-webfont.woff
diff --git a/assets/fonts/ubuntu-r-webfont.eot b/assets/fonts/ubuntu-r-webfont.eot
diff --git a/assets/fonts/ubuntu-r-webfont.svg b/assets/fonts/ubuntu-r-webfont.svg
diff --git a/assets/fonts/ubuntu-r-webfont.ttf b/assets/fonts/ubuntu-r-webfont.ttf
diff --git a/assets/fonts/ubuntu-r-webfont.woff b/assets/fonts/ubuntu-r-webfont.woff
diff --git a/assets/fonts/ubuntu-r-webfont.woff2 b/assets/fonts/ubuntu-r-webfont.woff2
diff --git a/assets/fonts/ubuntumono-r-webfont.eot b/assets/fonts/ubuntumono-r-webfont.eot
diff --git a/assets/fonts/ubuntumono-r-webfont.svg b/assets/fonts/ubuntumono-r-webfont.svg
diff --git a/assets/fonts/ubuntumono-r-webfont.ttf b/assets/fonts/ubuntumono-r-webfont.ttf
diff --git a/assets/fonts/ubuntumono-r-webfont.woff b/assets/fonts/ubuntumono-r-webfont.woff
diff --git a/assets/images/backgrounds/background-paper.png b/assets/images/backgrounds/background-paper.png
diff --git a/assets/images/forms/checkbox-checked.svg b/assets/images/forms/checkbox-checked.svg
diff --git a/assets/images/forms/checkbox.svg b/assets/images/forms/checkbox.svg
diff --git a/assets/images/forms/chevron-down.svg b/assets/images/forms/chevron-down.svg
diff --git a/assets/images/forms/chevron-up.svg b/assets/images/forms/chevron-up.svg
diff --git a/assets/images/icons/account.svg b/assets/images/icons/account.svg
diff --git a/assets/images/icons/add.svg b/assets/images/icons/add.svg
diff --git a/assets/images/icons/cross-orange.svg b/assets/images/icons/cross-orange.svg