Commit b554e74567c7a3ba2d547aa04fe81c33c8fad632
1 parent
8eabbd7dbd
Exists in
master
Fixed a bad merge...
Showing 1 changed file with 0 additions and 8 deletions Side-by-side Diff
README.md
... | ... | @@ -8,11 +8,7 @@ the case code to be used for both experimental and live testing. |
8 | 8 | This requires the following packages: |
9 | 9 | - mirgit.dcs.gla.ac.uk/JamesMcMinn/twitter |
10 | 10 | |
11 | -<<<<<<< HEAD | |
12 | 11 | Required packages can be installed using `go get packagepath` |
13 | -======= | |
14 | - Required packages can be installed using `go get packagepath` | |
15 | ->>>>>>> acc98bd827c6bd3c18627ed7ca0f896b7d50925c | |
16 | 12 | |
17 | 13 | ## Installing |
18 | 14 | Twitter Stream Reader can be installed using a number of methods. |
... | ... | @@ -22,11 +18,7 @@ The easiest method is to simply run `main.go` using the `go run` command: |
22 | 18 | |
23 | 19 | To build the application binary, `go build` can be used: |
24 | 20 | |
25 | -<<<<<<< HEAD | |
26 | 21 | go build mirgit.dcs.gla.ac.uk/JamesMcMinn/twitter-stream-reader |
27 | -======= | |
28 | - run `go build mirgit.dcs.gla.ac.uk/JamesMcMinn/twitter-stream-reader` | |
29 | ->>>>>>> acc98bd827c6bd3c18627ed7ca0f896b7d50925c | |
30 | 22 | |
31 | 23 | This will generate the binary in your current directory. |
32 | 24 |