solved conflicts

This commit is contained in:
Tristaan
2018-01-27 14:36:45 +01:00
parent cc02c6e367
commit c8277522d3
2 changed files with 2 additions and 2 deletions

View File

@@ -1,4 +1,3 @@
':/media/Downloads/Old Linux Games (x86)/Heavy Metal FAKK2
v:/home/tristan/build/rineja/app/views
a:/home/tristan/build/rineja/app/assets
c:/home/tristan/build/rineja/app/controllers