Skip to content

Commit 3c81dfd

Browse files
committed
Merge branch 'gh-pages' of https://github.com/garris/BackstopJS
2 parents faab86b + 2ea8482 commit 3c81dfd

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ If you have not installed BackstopJS in the past, follow the install instruction
2323
$ npm install garris/backstopjs#master
2424
```
2525

26-
If you are upgrading you can just run the above command without reinstalling anything else. Move your `bitmaps_reference` and `bitmaps_test` from your BackstopJS folder to your root directory you want to keep your existing test data.
26+
If you are upgrading you can just run the above command without reinstalling anything else. Move your `bitmaps_reference` and `bitmaps_test` from your BackstopJS folder to your root directory if you want to keep your existing test data.
2727

2828

2929

@@ -180,7 +180,7 @@ From `./node_modules/backstopjs` ...
180180
"bitmaps_reference": "../../backstop_data/bitmaps_reference",
181181
"bitmaps_test": "../../backstop_data/bitmaps_test",
182182
"compare_data": "../../backstop_data/bitmaps_test/compare.json"
183-
} },
183+
},
184184
"engine": "phantomjs"
185185
}
186186
```

index.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ <h2>Catch CSS curve balls.</h2>
7272
<button type="button" class="btn btn-primary">Get it on Github</button>
7373
</p>
7474
<p>
75-
<small><strong><a href="https://github.com/garris/BackstopJS#version-060-beta-available-now">Version 0.6.2 beta available now.</a></strong>
76-
<br/>Renders <strong>webfonts</strong> and <strong>flexbox</strong> – plays nice with source control too!</small>
75+
<small><strong><a href="https://github.com/garris/BackstopJS#version-060-beta-available-now">Version 0.6.2 beta available.</a></strong>
76+
<br/>Now tests html5 elements like <strong>webfonts</strong> and <strong>flexbox</strong> – plays nice with source control too!</small>
7777
</p>
7878
</div>
7979
</div>

0 commit comments

Comments
 (0)