Skip to content

Commit

Permalink
Fixed merge leftovers in README.md
Browse files Browse the repository at this point in the history
  • Loading branch information
Filippo Bonazzi committed Jun 3, 2016
1 parent b362933 commit 2fb434d
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,4 @@ All files distributed with this package indicate the appropriate license to use.
SELint is an open source project being developed by Filippo Bonazzi and Elena Reshetova from the [Secure Systems research group (SSG)](http://cse.aalto.fi/en/research/secure-systems/) at Aalto University.
The project is part of the [Intel Collaborative Research Institute for Secure Computing (ICRI-SC)](http://www.icri-sc.org).

<<<<<<< HEAD
You can find more information on the [project site](https://ssg.aalto.fi/projects/selint/).
=======
SELint is an open source project being developed by Filippo Bonazzi and Elena Reshetova from the [Secure Systems research group (SSG)](http://cse.aalto.fi/en/research/secure-systems/) at Aalto University. The project is part of the [Intel Collaborative Research Institute for Secure Computing (ICRI-SC)](http://www.icri-sc.org).
>>>>>>> master

0 comments on commit 2fb434d

Please sign in to comment.