aboutsummaryrefslogtreecommitdiff
path: root/src/_variables.scss
diff options
context:
space:
mode:
authorHakaba Hitoyo <example@example.com>2018-02-10 10:17:58 +0900
committerHakaba Hitoyo <example@example.com>2018-02-10 10:17:58 +0900
commitebd8300e36be1af75a093264e77a9ba317a605cd (patch)
tree670c8eb61d36459eb6573f64091178d5c0a737ba /src/_variables.scss
parentf23940a153b501f5edaecd292ebf2c7b9345d33f (diff)
parentb0f248c48384c888faef8fcf76ee8b3f8abfde8e (diff)
slove conflict
Diffstat (limited to 'src/_variables.scss')
0 files changed, 0 insertions, 0 deletions