search

NITDgpOS / UIP

A library, to customize your desktop wallpapers.
https://nitdgpos.github.io/projects/UIP
GNU Affero General Public License v3.0
19 stars 45 forks source link

generalTab.py : flush button removed #367

Closed jayantsaraf closed 7 years ago

jayantsaraf commented 7 years ago

flush button is removed from generalTab.py

Fixes : NIT-dgp/UIP #350

abhay-raizada commented 7 years ago

Hi thank you for your Patch make sure you have the right commit structure that is 

tag: Shortlog

body
Fixes <issue number/url>

Also please upload a screenshot if you have made changes to the gui.

abhay-raizada commented 7 years ago

@jayantsaraf you have merge conflict, it means your local files are not upto date with our master branch. please correct your commits, and solve these conflicts(probably the reason why all ticks fail)

jayantsaraf commented 7 years ago

can you please guide me how to do this?

abhay-raizada commented 7 years ago

@jayantsaraf gp through this: https://www.atlassian.com/git/tutorials/rewriting-history

nkprince007 commented 7 years ago

Closing due to inactivity and the presence of a new PR #368