Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history 
# Conflicts:
#
HackerHub-darwin-x64/HackerHub.app/Contents/Resources/app/nativefier.jso
n
  • Loading branch information
The-Hacker894 committed Apr 7, 2018
2 parents 292f76f + 462f9f6 commit 0fde8a6
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
6 changes: 5 additions & 1 deletion HackerHub-darwin-x64/HackerHub.app/Contents/Resources/app/nativefier.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
{"name":"HackerHub","targetUrl":"https://hacker-hub.github.io/","counter":false,"width":1280,"height":800,"showMenuBar":false,"fastQuit":false,"userAgent":"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36","nativefierVersion":"7.5.4","ignoreCertificate":false,"ignoreGpuBlacklist":false,"enableEs3Apis":false,"insecure":false,"flashPluginDir":null,"diskCacheSize":null,"fullScreen":false,"maximize":false,"zoom":1,"internalUrls":null,"singleInstance":false,"win32metadata":{"ProductName":"HackerHub","InternalName":"HackerHub","FileDescription":"HackerHub"},"tray":false,"basicAuthUsername":null,"basicAuthPassword":null}
<<<<<<< HEAD
{"name":"HackerHub","targetUrl":"https://hacker-hub.github.io/","counter":false,"width":1280,"height":800,"showMenuBar":false,"fastQuit":false,"userAgent":"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36","nativefierVersion":"7.5.4","ignoreCertificate":false,"ignoreGpuBlacklist":false,"enableEs3Apis":false,"insecure":false,"flashPluginDir":null,"diskCacheSize":null,"fullScreen":false,"maximize":false,"zoom":1,"internalUrls":null,"singleInstance":false,"win32metadata":{"ProductName":"HackerHub","InternalName":"HackerHub","FileDescription":"HackerHub"},"tray":false,"basicAuthUsername":null,"basicAuthPassword":null}
=======
{"name":"HackerHub","targetUrl":"https://hacker-hub.github.io/","counter":false,"width":1280,"height":800,"showMenuBar":false,"fastQuit":false,"userAgent":"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36","nativefierVersion":"7.5.4","ignoreCertificate":false,"ignoreGpuBlacklist":false,"enableEs3Apis":false,"insecure":false,"flashPluginDir":null,"diskCacheSize":null,"fullScreen":false,"maximize":false,"zoom":1,"internalUrls":null,"singleInstance":false,"win32metadata":{"ProductName":"HackerHub","InternalName":"HackerHub","FileDescription":"HackerHub"},"tray":false,"basicAuthUsername":null,"basicAuthPassword":null}
>>>>>>> origin/master
2 changes: 1 addition & 1 deletion HackerHub-win32-x64/resources/app/nativefier.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"name":"HackerHub","targetUrl":"https://corporal-cormorant-6710.dataplicity.io/","counter":false,"width":1280,"height":800,"showMenuBar":false,"fastQuit":false,"userAgent":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36","nativefierVersion":"7.5.4","ignoreCertificate":false,"ignoreGpuBlacklist":false,"enableEs3Apis":false,"insecure":false,"flashPluginDir":null,"diskCacheSize":null,"fullScreen":false,"maximize":false,"zoom":1,"internalUrls":null,"singleInstance":false,"win32metadata":{"ProductName":"HackerHub","InternalName":"HackerHub","FileDescription":"HackerHub"},"tray":false,"basicAuthUsername":null,"basicAuthPassword":null}
{"name":"HackerHub","targetUrl":"https://hacker-hub.github.io/","counter":false,"width":1280,"height":800,"showMenuBar":false,"fastQuit":false,"userAgent":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36","nativefierVersion":"7.5.4","ignoreCertificate":false,"ignoreGpuBlacklist":false,"enableEs3Apis":false,"insecure":false,"flashPluginDir":null,"diskCacheSize":null,"fullScreen":false,"maximize":false,"zoom":1,"internalUrls":null,"singleInstance":false,"win32metadata":{"ProductName":"HackerHub","InternalName":"HackerHub","FileDescription":"HackerHub"},"tray":false,"basicAuthUsername":null,"basicAuthPassword":null}
2 changes: 1 addition & 1 deletion hacker-hub-linux-x64/resources/app/nativefier.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"name":"hacker-hub","targetUrl":"https://corporal-cormorant-6710.dataplicity.io/","counter":false,"width":1280,"height":800,"showMenuBar":false,"fastQuit":false,"userAgent":"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36","nativefierVersion":"7.5.4","ignoreCertificate":false,"ignoreGpuBlacklist":false,"enableEs3Apis":false,"insecure":false,"flashPluginDir":null,"diskCacheSize":null,"fullScreen":false,"maximize":false,"zoom":1,"internalUrls":null,"singleInstance":false,"win32metadata":{"ProductName":"HackerHub","InternalName":"HackerHub","FileDescription":"HackerHub"},"tray":false,"basicAuthUsername":null,"basicAuthPassword":null}
{"name":"hacker-hub","targetUrl":"https://hacker-hub.github.io/","counter":false,"width":1280,"height":800,"showMenuBar":false,"fastQuit":false,"userAgent":"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36","nativefierVersion":"7.5.4","ignoreCertificate":false,"ignoreGpuBlacklist":false,"enableEs3Apis":false,"insecure":false,"flashPluginDir":null,"diskCacheSize":null,"fullScreen":false,"maximize":false,"zoom":1,"internalUrls":null,"singleInstance":false,"win32metadata":{"ProductName":"HackerHub","InternalName":"HackerHub","FileDescription":"HackerHub"},"tray":false,"basicAuthUsername":null,"basicAuthPassword":null}

0 comments on commit 0fde8a6

Please sign in to comment.