Fix some rebasing conflicts

This commit is contained in:
Franc Camps-Febrer
2018-12-10 16:12:18 +01:00
parent f76000d4d9
commit dc1dece1d9
5 changed files with 12 additions and 25 deletions

View File

@@ -1,6 +1,6 @@
import React from 'react';
import { capitalizeFirstLetter } from '../../js/data/utilities.js';
import { capitalizeFirstLetter } from '../../js/utilities.js';
const CardCategory = ({ categoryTitle, categoryLabel, color }) => (
<div className="card-row card-cell category">