[geany/geany-plugins] 947fb4: fix: TODO

[Enrico]

Branch:      refs/heads/master
Author:      Enrico <enrico.trt at gmail.com>
Committer:   Enrico <enrico.trt at gmail.com>
Date:        Wed, 02 May 2012 23:22:53
Commit:      947fb431592ed5df1b2bb0af68f43fc5f2480591
             https://github.com/geany/geany-plugins/commit/947fb431592ed5df1b2bb0af68f43fc5f2480591

Log Message:
-----------
fix: TODO


Modified Paths:
--------------
    geniuspaste/TODO

Modified: geniuspaste/TODO
6 files changed, 1 insertions(+), 5 deletions(-)
===================================================================
@@ -1,10 +1,6 @@
 TODO
 ----
-<<<<<<< HEAD
 
     [!] Implement saving/loading of the settings
     [-] Make the geany's pastebin the default pastebin
-=======
-   [!] Implement saving/loading of settings
-   [-] Make the geany's pastebin the default pastebin
->>>>>>> d6582fb2731265f58dca68297c195a35847d0852
+


@@ Diff output truncated at 100000 characters. @@


--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).