diff options
| author | Danielh112 <Daniel@sbgsportssoftware.com> | 2020-08-18 11:29:25 +0100 |
|---|---|---|
| committer | Danielh112 <Daniel@sbgsportssoftware.com> | 2020-08-18 11:29:25 +0100 |
| commit | f7e9ee56d2ed5447f59e5548f005fabdab2f0a72 (patch) | |
| tree | a16300fa62e68b3310ae96e36dba65981f0024ef /demo/src/sass/lib/reset.scss | |
| parent | 22af7f16ea4a4269321d29242d63ec23718c92da (diff) | |
| parent | 423b7b276f1572eb666de32094a9aacd32e87d18 (diff) | |
| download | plyr-f7e9ee56d2ed5447f59e5548f005fabdab2f0a72.tar.lz plyr-f7e9ee56d2ed5447f59e5548f005fabdab2f0a72.tar.xz plyr-f7e9ee56d2ed5447f59e5548f005fabdab2f0a72.zip | |
Fix merge conflicts
Diffstat (limited to 'demo/src/sass/lib/reset.scss')
| -rw-r--r-- | demo/src/sass/lib/reset.scss | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demo/src/sass/lib/reset.scss b/demo/src/sass/lib/reset.scss index 50798b10..9d987fe2 100644 --- a/demo/src/sass/lib/reset.scss +++ b/demo/src/sass/lib/reset.scss @@ -7,5 +7,5 @@ *, *::after, *::before { - box-sizing: border-box; + box-sizing: border-box; } |