[ZKforge-subversion-log] SF.net SVN: zkforge: [298] trunk/timelinez/src/org/zkforge/timeline/Version .java

[<tz...@us...>]

Revision: 298
          http://svn.sourceforge.net/zkforge/?rev=298&view=rev
Author:   tzgwx
Date:     2007-05-20 19:15:14 -0700 (Sun, 20 May 2007)

Log Message:
-----------


Modified Paths:
--------------
    trunk/timelinez/src/org/zkforge/timeline/Version.java

Modified: trunk/timelinez/src/org/zkforge/timeline/Version.java
===================================================================
--- trunk/timelinez/src/org/zkforge/timeline/Version.java	2007-05-21 01:39:00 UTC (rev 297)
+++ trunk/timelinez/src/org/zkforge/timeline/Version.java	2007-05-21 02:15:14 UTC (rev 298)
@@ -1,33 +1,31 @@
 /* Version.java
 
-{{IS_NOTE
-	Purpose:
-		
-	Description:
-		
-	History:
-		Tue Jul 25 11:57:16     2006, Created by tomyeh
-}}IS_NOTE
+ {{IS_NOTE
+ Purpose:
+ 
+ Description:
+ 
+ History:
+ Tue Jul 25 11:57:16     2006, Created by tomyeh
+ }}IS_NOTE
 
-Copyright (C) 2006 Potix Corporation. All Rights Reserved.
+ Copyright (C) 2006 Potix Corporation. All Rights Reserved.
 
-{{IS_RIGHT
-}}IS_RIGHT
-*/
+ {{IS_RIGHT
+ }}IS_RIGHT
+ */
 package org.zkforge.timeline;
 
 /**
- * Specified this in lang.xml, such that ZK knows what lang-addon.xml is associated
- * with timelinez.
+ * Specified this in lang.xml, such that ZK knows what lang-addon.xml is
+ * associated with timelinez.
  * 
  * @author Gu WeiXing
  */
 public class Version {
-	/** Returns the version UID.
+	/**
+	 * Returns the version UID.
 	 */
-<<<<<<< .mine
-	public static final String UID = "1.1-3";
-=======
 	public static final String UID = "1.1_3";
->>>>>>> .r294
+
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.