Commit 24036aa71d24a24f9a1be4461fd4a9718ae79c72

Authored by matyapiro31
1 parent 3e9dc74e

fix ReadMe.md to upstream.

Showing 1 changed file with 1 additions and 20 deletions
README.md
... ... @@ -44,25 +44,6 @@ Arch Linux packages all the required dependencies, so you can install the plugin
44 44 make
45 45 sudo make install
46 46  
47   -<<<<<<< HEAD
48   -How to install (Ubuntu/Debian)
49   ------------------------
50   -
51   -Use repository.
52   -Now we have two repository:
53   -
54   -http://debian.altrepo.eu/ (Main)
55   -
56   -http://debian.surlinter.net/ (Mirror)
57   -
58   -You may learn how to add a repository [here](https://help.ubuntu.com/community/Repositories/Ubuntu).
59   -
60   -To install purple-line, just type command:
61   -
62   - sudo apt-get install purple-line
63   -
64   -after you added and update your repository.
65   -=======
66 47 Install from source (any distribution)
67 48 --------------------------------------
68 49  
... ... @@ -145,4 +126,4 @@ Features not yet implemented
145 126 * Open video messages
146 127 * Sending/receiving "message read" notifications
147 128 * Check builds on more platforms
148 129 -* Packaging
  130 +* Packaging
149 131 \ No newline at end of file
... ...