diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-05-07 01:35:48 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-05-07 01:35:48 +0200 |
| commit | 4e574b8a94031ffb3214e9ee811096da15a53893 (patch) | |
| tree | 63741236fe7b30f026ca2ae3a4a350d84a71521d /src/autosaver.h | |
| parent | updated TODO (diff) | |
| download | rekonq-4e574b8a94031ffb3214e9ee811096da15a53893.tar.xz | |
Fixing forgotten merging issues..
Diffstat (limited to 'src/autosaver.h')
| -rw-r--r-- | src/autosaver.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/autosaver.h b/src/autosaver.h index b486fcb9..7ce44f78 100644 --- a/src/autosaver.h +++ b/src/autosaver.h @@ -38,7 +38,6 @@ * */ ->>>>>>> master:src/autosaver.h class AutoSaver : public QObject { Q_OBJECT @@ -61,4 +60,3 @@ private: }; #endif // AUTOSAVER_H - |