From d01cc0bc508916117a7e7319e2a70a3664b89871 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Tue, 28 Feb 2012 17:45:08 +0530
Subject: [PATCH] messages and merge

---
 version.num | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/version.num b/version.num
index 37e7ba980b2..5cd7ca2206d 100644
--- a/version.num
+++ b/version.num
@@ -1,5 +1 @@
-<<<<<<< HEAD
-748
-=======
-747
->>>>>>> da27db4c7d46e37d65c57d14c384b873ce4b94b3
+748
\ No newline at end of file