building 0.0.6

fjenett · Sep 19, 2013 · 9a2d21b · 9a2d21b
1 parent 5b28aa7
commit 9a2d21b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/releases/Guido.txt b/releases/Guido.txt
@@ -4,10 +4,5 @@ url = https://github.com/fjenett/Guido
 category = GUI
 sentence = A simple cross mode GUI library.
 paragraph =  Guido is a small GUI library that is compatible with both Java (standard) and JavaScript modes.
-<<<<<<< HEAD
-version = 163
-prettyVersion = 0.0.6
-=======
-version = 164
-prettyVersion = 0.0.5
->>>>>>> master
+version = 165
+prettyVersion = 0.0.6
diff --git a/releases/Guido.zip b/releases/Guido.zip