Fix rebase shit

This commit is contained in:
Aarni Halinen
2019-07-05 00:10:45 +03:00
parent 734626f438
commit 2e511a9ccf
-4
View File
@@ -5,10 +5,6 @@ import { ColorEnum } from "../../components/ColorDiv/ColorDiv";
import { StaticContext } from "../../server/StaticContext";
import PageLink from "../../components/PageLink/PageLink";
import Card from "../../components/Card";
<<<<<<< HEAD
=======
import { BackgroundColor as PageSectionColor } from "../../components/PageSection/PageSection";
>>>>>>> Style fixes
import PageSection from "../../components/PageSection";
import HeroMainSection from "../../components/HeroMainSection";
import ContactCard from "../../components/ContactCard";