merged conflict

mcofie · Jul 15, 2017 · 3dcce52 · 3dcce52
2 parents b52e0c9 + 2fc92ec
commit 3dcce52
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -98,8 +98,9 @@ These built in transitions create a seamless movement between objects or element
 
 
 *Custom Transitions*
+
 | Transition Name | Class Name |
-| --------------- | ---------- |
+| --------------: | :--------- |
 | Force | `force` |
 | Warm Up | `warm-up` |
 | Palpitate | `palpitate` |
@@ -110,7 +111,7 @@ These built in transitions create a seamless movement between objects or element
 ### Translation
 
 | Translation Name | Class Name | Condition |
-| ---------------- | ---------- | --------- |
+| ---------------: | :--------: | :-------: |
 | Scale | `sc-ml<num>-mg<num>` *or* `sc-<num>` | `where  1 <= num <= 5`  |
 | Skew | `sk-<r|l>-<num>` | `where num =`|
 | Translate | `trnl-<num>-<num>` |   |