diff options
| author | Nathan Kinkade <nath@nkinka.de> | 2013-01-16 17:32:36 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nath@nkinka.de> | 2013-01-16 17:32:36 +0000 |
| commit | 0047af90bf4db08b22838e6ded22a7fa70cee98a (patch) | |
| tree | 1c6cb658ffac9ae5d00e32668bed1b1bfbf70b5a /.build_number | |
| parent | 77e2e58aeff49477242f789b367def4b08836a47 (diff) | |
| parent | 9d684b7b83f0aa026e9d6f06228294f179a3bcaa (diff) | |
Manually resolved conflict after recent pull.
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 5e176488..d4dd6e0c 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=264 +build_number=269 |