Fix botched merge

src/NSDateAdditions.m

@@ -0,0 +1,13 @@
+#import "Three20/TTGlobal.h"
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+@implementation NSDate (TTCategory)
+
++ (id)dateWithToday {
+  NSString* format = @"%Y-%m-%d 00:00:00 +0700";
+  NSString* time = [[NSDate date] descriptionWithCalendarFormat:format timeZone:nil locale:nil];
+  return [self dateWithString:time];
+}
+
+@end

src/NSStringAdditions.m

@@ -15,29 +15,6 @@ - (BOOL)isWhitespace {
   return YES;
 }
 
-- (BOOL)beginsWithString:(NSString*)substring {
-  if (self.length < substring.length) {
-    return NO;
-  } else {
-    NSRange searchRange = NSMakeRange(0, substring.length);
-    NSRange range = [self rangeOfString:substring options:0 range:searchRange];
-    return range.location == searchRange.location;
-  }
-}
-
-- (BOOL)endsWithString:(NSString*)substring {
-  if (self.length < substring.length) {
-    return NO;
-  } else {
-    NSRange searchRange = NSMakeRange(self.length - substring.length, substring.length);
-    NSRange range = [self rangeOfString:substring options:0 range:searchRange];
-    return range.location == searchRange.location;
-  }
-
-  NSRange range = [self rangeOfString:substring];
-  return range.location == self.length - substring.length;
-}
-
 // Copied and pasted from http://www.mail-archive.com/cocoa-dev@lists.apple.com/msg28175.html
 - (NSDictionary*)queryDictionaryUsingEncoding: (NSStringEncoding)encoding {
   NSCharacterSet* delimiterSet = [NSCharacterSet characterSetWithCharactersInString:@"&;"];

src/Three20/NSDateAdditions.h

@@ -0,0 +1,8 @@
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+@interface NSDate (TTCategory)
+
++ (id)dateWithToday;
+
+@end

src/Three20/NSStringAdditions.h

@@ -0,0 +1,10 @@
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+@interface NSString (TTCategory)
+
+- (BOOL)isWhitespace;
+
+- (NSDictionary*)queryDictionaryUsingEncoding: (NSStringEncoding)encoding;
+
+@end