From 3e82ae5368654060aeac04359ed214c564c5c951 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 1 Mar 2016 19:35:27 +0200 Subject: [PATCH 1/2] chenge index dev-2 --- index.php | 1 + 1 file changed, 1 insertion(+) diff --git a/index.php b/index.php index fd84a7b..5ee6619 100644 --- a/index.php +++ b/index.php @@ -1 +1,2 @@ commit 1 +commit 2 From 0837f2ff45baf18786dabc5da6c5313ccd094e9b Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 1 Mar 2016 19:36:16 +0200 Subject: [PATCH 2/2] styles conflict --- styles.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/styles.css b/styles.css index 8cf55c5..860e420 100644 --- a/styles.css +++ b/styles.css @@ -1,4 +1,4 @@ .class{ - color:red; + color:brown; text-align:left; -} \ No newline at end of file +}