diff options
| author | Chris Elsworth <chris.elsworth@bytemark.co.uk> | 2017-01-31 12:43:28 +0000 |
|---|---|---|
| committer | Chris Elsworth <chris.elsworth@bytemark.co.uk> | 2017-01-31 12:43:28 +0000 |
| commit | 6844701e97107c389e332bb8efdadafba5cc17b5 (patch) | |
| tree | 2c84c0c0db796c3cb8e86f9538e71f104c2ca2f4 | |
| parent | 9703376afbebf06711bf5d1e874a59f806afd0f2 (diff) | |
| parent | 35c1bcba1727aee5162982afcf82af25494d35c0 (diff) | |
Merge branch 'fix-bad-merge-2nd-go' into 'master'
Fix bad merge !5.
See merge request !8
| -rw-r--r-- | lib/byteback/backup_directory.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/byteback/backup_directory.rb b/lib/byteback/backup_directory.rb index a39cf84..01871d3 100644 --- a/lib/byteback/backup_directory.rb +++ b/lib/byteback/backup_directory.rb @@ -1,4 +1,4 @@ -require 'byteback/utils' +require 'byteback/util' module Byteback # Represents a particular timestamped backup directory |