Skip to content

Commit

Permalink
got rid of merge conflit generated files
Browse files Browse the repository at this point in the history
  • Loading branch information
Roussel Xavier committed May 4, 2015
1 parent 16974bf commit 767df1c
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 580 deletions.
243 changes: 0 additions & 243 deletions src/Xavrsl/Cas/Sso.php.orig

This file was deleted.

116 changes: 0 additions & 116 deletions src/config/config_BACKUP_3928.php

This file was deleted.

Loading

0 comments on commit 767df1c

Please sign in to comment.