aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/version.in6
1 files changed, 5 insertions, 1 deletions
diff --git a/gdb/version.in b/gdb/version.in
index 41c22b8..9e485ab 100644
--- a/gdb/version.in
+++ b/gdb/version.in
@@ -1 +1,5 @@
-5.2.1.0.90_2002-09-05-cvs
+<<<<<<< version.in
+5.3.0.90_2003-02-27-cvs
+=======
+5.2.1.0.90_2003-02-27-cvs
+>>>>>>> 1.262.2.193