Fixing merge conflict in README.

alibby · Feb 2, 2012 · 5c6c36f · 5c6c36f
1 parent 53dc7bc
commit 5c6c36f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/README b/README
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 Flat Filer
 
 [ Tue Apr 15 12:27:50 EDT 2008 ]
@@ -27,7 +26,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 =======
->>>>>>> 3855d7678fd66e98d655f5faecf72a771799748a
 
 [ Wed Jan 31 16:09:03 EST 2007 ]
 

diff --git a/Rakefile b/Rakefile
@@ -24,10 +24,10 @@ end
 
 spec = Gem::Specification.new do |s| 
   s.name = "flat_filer"
-  s.version = "0.0.18"
+  s.version = "0.0.19"
   s.author = "Andrew Libby"
-  s.email = "alibby@tangeis.com"
-  s.homepage = "http://www.tangeis.com/"
+  s.email = "alibby@xforty.com"
+  s.homepage = "http://www.xforty.com/"
   s.platform = Gem::Platform::RUBY
   s.summary = "Library for processing flat files"
   s.files = FileList["lib/**/*"].to_a