Skip to content

Commit 6bec288

Browse files
heathermillerheathermiller
committed
Fixing merge conflicts
2 parents 57db031 + b3d7059 commit 6bec288

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

‎README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# scala.epfl.ch
2+
Website for Scala@EPFL
3+
1st test

‎_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Site settings
2-
title: Scala Center
2+
title: Scala Center at EPFL
33
email: [email protected]
44
description: > # this means to ignore newlines until "baseurl:"
55
The Scala Center at EPFL. Not-for-profit, "for the good of all"

‎index.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
---
3+
4+
Hi there! This is the Scala Center website! :)
5+
6+
Copyright EPFL 2015

0 commit comments

Comments
 (0)