diff options
| author | sajolida <sajolida@pimienta.org> | 2015-12-23 15:33:27 +0000 |
|---|---|---|
| committer | sajolida <sajolida@pimienta.org> | 2015-12-23 15:33:27 +0000 |
| commit | c27c192b60870f7a584d492e143c3a9c79ff546f (patch) | |
| tree | f2a4395e4cd5fc9f08e69033832bae5976e4165c /wiki/src/install/debian/clone | |
| parent | 4c95bb2434c3d85a9a8c8ae14104a66afb4cd264 (diff) | |
Fix badly resolved conflicts
Diffstat (limited to 'wiki/src/install/debian/clone')
| -rw-r--r-- | wiki/src/install/debian/clone/overview.fa.po | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/wiki/src/install/debian/clone/overview.fa.po b/wiki/src/install/debian/clone/overview.fa.po index d3b1bcc..a9dcccc 100644 --- a/wiki/src/install/debian/clone/overview.fa.po +++ b/wiki/src/install/debian/clone/overview.fa.po @@ -7,11 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -<<<<<<< HEAD -"POT-Creation-Date: 2015-12-23 15:01+0100\n" -======= "POT-Creation-Date: 2015-11-30 21:10+0000\n" ->>>>>>> web/10400-farsi-only "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" |