Skip to content

Added Font size and font family feature - #11

Merged
pH-7 merged 9 commits into
pH-7:masterfrom
akashdeepsingh9988:master
Feb 18, 2017
Merged

Added Font size and font family feature#11
pH-7 merged 9 commits into
pH-7:masterfrom
akashdeepsingh9988:master

Conversation

@akashdeepsingh9988

Copy link
Copy Markdown
Contributor

Added Font size and font family features

capture

capture2

@pH-7

pH-7 commented Feb 6, 2017

Copy link
Copy Markdown
Owner

That's really great @akashdeepsingh9988! You have some conflicts though. Let me know if you can fix them ...or I will dig into it.

@akashdeepsingh9988

Copy link
Copy Markdown
Contributor Author

I am unable to resolve the conflict.

The following message is displayed :

"This branch has conflicts that must be resolved
Only those with write access to this repository can merge pull requests.
"

**Conflicting files

src/simplejavatexteditor/UI.java**

@pH-7
pH-7 merged commit 6c29556 into pH-7:master Feb 18, 2017
@pH-7

pH-7 commented Feb 18, 2017

Copy link
Copy Markdown
Owner

👍 Perfect, thanks a lot @akashdeepsingh9988

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants