From 5ebeece5b4a8df81d59ca7558b278a4263d15128 Mon Sep 17 00:00:00 2001 From: praveeng Date: Thu, 28 Jul 2016 15:01:36 +0530 Subject: [PATCH] Revert commits 8aee306 Change-Id: I3dd999c77c6779332a40dbb84371ca487216f189 --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 7142a1329..5f428b784 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,11 @@ [![Build Status](https://travis-ci.org/flame/blis.svg?branch=master)](https://travis-ci.org/flame/blis) +<<<<<<< HEAD Introduction +======= +Introduction.. +>>>>>>> parent of 357c990... first commit ------------ BLIS is a portable software framework for instantiating high-performance