diff options
| author | Nathan Kinkade <nath@nkinka.de> | 2011-09-28 20:39:05 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nath@nkinka.de> | 2011-09-28 20:39:05 +0000 |
| commit | 47456c0de8a408bca9b5a02a0fbc835ff1c01a68 (patch) | |
| tree | dca2ead5e7159b28aa323465a363f81813f75acd /.build_number | |
| parent | d8dffba94277c2179a59eb72d6927a5bdb879648 (diff) | |
| parent | dfbfe090168ee4ed44e2c8208e79d3fe40f90437 (diff) | |
Manually fixed a merge conflict after pulling.
Diffstat (limited to '.build_number')
| -rw-r--r-- | .build_number | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.build_number b/.build_number index a533fe1e..a8c3e6c9 100644 --- a/.build_number +++ b/.build_number @@ -3,4 +3,4 @@ ; process. You don't need to edit it. In fact.. ; ; DO NOT EDIT THIS FILE BY HAND! -build_number=170 +build_number=174 |