Skip to content

Commit 40ef01b

Browse files
author
Youssef Abou-Kewik
committed
Update build instructions
1 parent eda638a commit 40ef01b

1 file changed

Lines changed: 1 addition & 4 deletions

File tree

osx/README.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,7 @@ curl -O https://git.gnome.org/browse/gtk-osx/plain/gtk-osx-build-setup.sh
3131
sh gtk-osx-build-setup.sh
3232
~/.local/bin/jhbuild shell
3333
```
34-
<<<<<<< HEAD
3534
You can exit the shell once you determine that it works properly
36-
=======
37-
>>>>>>> da87c5c4fffb10614d606301de670c7807f1f69b
3835

3936
3. Build python
4037
```
@@ -83,7 +80,7 @@ jhbuild
8380
8. Build extra dependencies
8481
```
8582
jhbuild -m osx/meld.modules build meld-python-deps
86-
easy_install py2app
83+
jhbuild run easy_install py2app
8784
```
8885

8986
9. You're now ready to build Meld.

0 commit comments

Comments
 (0)