Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Theme-Cicada #595

Closed
wants to merge 32 commits into from
Closed

Theme-Cicada #595

wants to merge 32 commits into from

Conversation

ghost
Copy link

@ghost ghost commented Mar 11, 2018

i couldn´t re-fork my repo. i changed the things you told me in the files.
i couldn´t work from a clean basic repo because it doesn´t sync on fork to my repo anymore.
if i did this
git_remote
"git merge upstream/master" it doesn´t sync the latest version of opnsense/plugins
Doen´t know why?!?!

Then i tried:
git checkout master
git fetch upstream
git merge upstream/master
git checkout -b Theme-Cicada
git commit -m "Theme-Cicada"
git push -u origin feature

marjohn56 and others added 30 commits February 12, 2018 11:33
Update rev
remove unwanted putty.
Signed-off-by: opnsense_user12123 <remic-webdesign@chello.at>
Signed-off-by: opnsense_user12123 <remic-webdesign@chello.at>
https://github.com/opnsenseuser12123/plugins.git

Conflicts:
	misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/main.css
@ghost ghost closed this Mar 11, 2018
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants