Fixed conflict

This commit is contained in:
Mark Badolato 2016-12-11 20:30:25 -07:00
commit 46a010c22b
4 changed files with 223 additions and 0 deletions

View file

@ -120,6 +120,10 @@ Screenshots
![image](espresso_libre.png)
`firewatch.png`
![image](firewatch.png)
`fish_tank.png`
![image](fish_tank.png)

BIN
screenshots/firewatch.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 202 KiB