Permalink
Browse files

resolved conflict in readme

  • Loading branch information...
dcurtis committed Mar 16, 2012
2 parents 6f90e44 + 7eb9ecd commit fc241d7e1278f6ef703247b31cf77f82b1b23e1c
Showing with 9 additions and 9 deletions.
  1. +9 −9 README.md
View
@@ -2,7 +2,7 @@ This is The Open Brand, a framework for clearly and properly defining a brand. T
Because of its structure, the Open Brand can be used by stakeholders possessing any level of design experience.
-In addition to the following README, see inside the png/, psd/, spec/, and svg/ folders for individual READMEs which define the structure of an Open Brand.
+In addition to the following README, see inside the `png/`, `psd/`, `spec/`, and `svg/` folders for individual `README`s which define the structure of an Open Brand.
For an example of an Open Brand in use, see [The Markdown Mark](http://github.com/dcurtis/markdown-mark).
@@ -12,29 +12,29 @@ For an example of an Open Brand in use, see [The Markdown Mark](http://github.co
# [ Write the name of the brand here. ]
-Use this mark to identify [brand name]. It should be used to identify [ write list of places to use this mark for identifcation. See "examples" for more information. ]. If you are absolutely unable to use an image to display the [brand name], use this unicode approximation: [ Show a unicode approximation, if applicable. ]. See "Usage".
+Use this mark to identify [brand name]. It should be used to identify [ write list of places to use this mark for identification. See "Examples" for more information. ]. If you are absolutely unable to use an image to display the [brand name], use this Unicode approximation: [ Show a Unicode approximation, if applicable. ]. See "Usage".
[ Include a list of attributions and sources here, including the creators of the mark. ]
## Specification
-[ Include an image file of the brand specification, as described in sec/README, here. ]
+[ Include an image file of the brand specification, as described in `spec/README`, here. ]
-Let the [ chosen visual anchor, see spec/README ] be X. The internal whitespace between [ list other items which are spaced by X ] should be precisely X. [ Write more defintions for the spec here, if necessary. Be specific. ]
+Let the [ chosen visual anchor, see `spec/README` ] be X. The internal whitespace between [ list other items which are spaced by X ] should be precisely X. [ Write more definitions for the spec here, if necessary. Be specific. ]
## Usage
-You should use this mark to identify [ Write list of places to use this mark for identifcation. See "examples" for more information. Use the same language as in the introduction above. ]. Although you may modify this mark any way you like, without restriction, please respect the following guidelines:
+You should use this mark to identify [ Write list of places to use this mark for identification. See "Examples" for more information. Use the same language as in the introduction above. ]. Although you may modify this mark any way you like, without restriction, please respect the following guidelines:
-[ Numbered list of restrictions and guidelines. See "examples" for more information. ]
+[ Numbered list of restrictions and guidelines. See "Examples" for more information. ]
### Unicode Approximation
-If you cannot use an image for the [brand name], use this unicode approximation:
+If you cannot use an image for the [brand name], use this Unicode approximation:
-__[ unicode approximation ]__
+__[ Unicode approximation ]__
-Do not use this unicode approximation unless you are absolutely unable to use an image to display the [brand name].
+Do not use this Unicode approximation unless you are absolutely unable to use an image to display the [brand name].
## Examples

0 comments on commit fc241d7

Please sign in to comment.