v4.3.1beta

Kris-B · Apr 9, 2014 · 18de2ac · 18de2ac
1 parent b7e821b
commit 18de2ac
Show file tree

Hide file tree

Showing 2 changed files with 252 additions and 111 deletions.
diff --git a/README.md b/README.md
@@ -95,8 +95,6 @@ Usage (v4.3)
 
 Note: If you specify a theme, the corresponding css file must also be included.
 
->>>>>>> a5ad3b854e129b5123dc46baa29c9026bb0347c7
-
 ### Method 1: use one Flickr account
 
 * Create a container