Commit Graph

4 Commits

Author SHA1 Message Date
Brendan Forster 80719c0033 aaaand format the code 2015-11-04 13:38:51 -08:00
Kristian Hellang 2508205cfd Fixed failing tests 2015-03-18 14:33:06 +01:00
Lars Tabro Sørensen 7a6b988f8a Fixed broken conventions. Wrote a integrationstests that performs an actual merge between two branches. 2015-01-31 23:15:26 +01:00
Lars Tabro Sørensen 9ba5377599 Initial integration tests - needs to create a branch to check mergin between branches 2014-11-05 09:13:06 +01:00