[geany/geany-plugins] 46845a: bugfixes

[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:20:52
Commit:      46845a787d90d8b48aee50d39811e192d54e25f8
             https://github.com/geany/geany-plugins/commit/46845a787d90d8b48aee50d39811e192d54e25f8

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


Modified Paths:
--------------
    geniuspaste/TODO
    geniuspaste/src/geniuspaste.c

Modified: geniuspaste/TODO
5 files changed, 5 insertions(+), 0 deletions(-)
===================================================================
@@ -1,5 +1,10 @@
 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


Modified: geniuspaste/src/geniuspaste.c
1 files changed, 0 insertions(+), 1 deletions(-)
===================================================================
@@ -1,4 +1,3 @@
-
 /*
  *  geniuspaste - paste your code on your favorite pastebin.
  *


@@ Diff output truncated at 100000 characters. @@


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